From a0f6e76f90365e0c6860fa56aa55cec1b227867d Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite@mail.ru>
Date: Tue, 19 Mar 2024 19:38:54 +1000
Subject: [PATCH 01/46] Feature(backend): Migrate to Django 5.0

---
 .gitlab-ci.yml                                |  4 +--
 .pylintrc                                     |  4 +--
 pyproject.toml                                |  6 ++---
 requirements-prod.txt                         |  4 +--
 requirements-rpc.txt                          |  2 +-
 requirements-rtd.txt                          |  4 +--
 requirements-test.txt                         |  4 +--
 requirements.txt                              |  4 +--
 setup.py                                      |  2 +-
 .../0044_product_uniq_name_store.py           |  2 +-
 .../0045_dynamicfields_generated_field.py     | 19 +++++++++++++
 test_src/test_proj/models/dynamic_fields.py   |  8 +++++-
 test_src/test_proj/models/nested_models.py    |  2 +-
 test_src/test_proj/tests.py                   | 23 +++++++++++++---
 tox.ini                                       | 27 +++++++++----------
 tox_build.ini                                 |  2 +-
 vstutils/api/endpoint.py                      |  3 +--
 vstutils/api/health.py                        |  5 ++--
 vstutils/api/schema/inspectors.py             |  4 +--
 vstutils/api/serializers.py                   | 16 +++++++++--
 vstutils/management/commands/rpc_worker.py    |  8 +++---
 vstutils/models/fields.py                     |  2 +-
 vstutils/tests.py                             |  2 +-
 vstutils/utils.py                             |  3 +--
 24 files changed, 103 insertions(+), 57 deletions(-)
 create mode 100644 test_src/test_proj/migrations/0045_dynamicfields_generated_field.py

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e578540..d56d91ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,9 +81,9 @@ functional_test:
   parallel:
     matrix:
       - TOX_ENVS:
-          - py38-django42-install
+          - py310-django50-install
       - TOX_ENVS:
-          - py312-django42-coverage
+          - py312-django50-coverage
 
 js_tests:
   <<: *branch_js_tests
diff --git a/.pylintrc b/.pylintrc
index 297ec92a..927aae29 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -13,7 +13,7 @@ ignore=CVS,migrations,unittests,tests,settings.py,settings_production.py
 
 # Add files or directories matching the regex patterns to the blacklist. The
 # regex matches against base names, not paths.
-# ignore-patterns=
+ignore-patterns=.*.pyi
 
 # Pickle collected data for later comparisons.
 # persistent=yes
@@ -56,7 +56,7 @@ confidence=
 # --enable=similarities". If you want to run only the classes checker, but have
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
-disable=unused-private-member,super-with-arguments,duplicate-code,logging-fstring-interpolation,no-else-continue,unused-argument,signature-differs,no-else-return,consider-using-ternary,inconsistent-return-statements,len-as-condition,keyword-arg-before-vararg,expression-not-assigned,broad-except,logging-format-interpolation,model-no-explicit-unicode,too-many-ancestors,redefined-builtin,missing-docstring,line-too-long,suppressed-message,useless-suppression,model-has-unicode,bare-except,too-few-public-methods,fixme,dangerous-default-value,attribute-defined-outside-init,pointless-string-statement,too-many-instance-attributes,arguments-differ,binary-op-exception,bad-classmethod-argument,locally-disabled,file-ignored,multiple-statements,superfluous-parens,isinstance-second-argument-not-valid-type
+disable=cyclic-import,unused-private-member,super-with-arguments,duplicate-code,logging-fstring-interpolation,no-else-continue,unused-argument,signature-differs,no-else-return,consider-using-ternary,inconsistent-return-statements,len-as-condition,keyword-arg-before-vararg,expression-not-assigned,broad-except,logging-format-interpolation,model-no-explicit-unicode,too-many-ancestors,redefined-builtin,missing-docstring,line-too-long,suppressed-message,useless-suppression,model-has-unicode,bare-except,too-few-public-methods,fixme,dangerous-default-value,attribute-defined-outside-init,pointless-string-statement,too-many-instance-attributes,arguments-differ,binary-op-exception,bad-classmethod-argument,locally-disabled,file-ignored,multiple-statements,superfluous-parens,isinstance-second-argument-not-valid-type
 
 
 [REPORTS]
diff --git a/pyproject.toml b/pyproject.toml
index 3b1994fd..79035ab8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,14 +18,12 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Web Environment",
     "Framework :: Django",
-    "Framework :: Django :: 4.2",
+    "Framework :: Django :: 5.0",
     "Operating System :: POSIX",
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -67,7 +65,7 @@ include = ['vstutils', 'vstutils.*']
 namespaces = false
 
 [tool.flake8]
-ignore = "E221,E222,E121,E123,E126,E226,E24,E704,E116,E731,E722,E741,W504,B001,B008,B023,C812,C815,CFQ004,B019,I100"
+ignore = "E221,E222,E121,E123,E126,E226,E24,E704,E116,E731,E722,E741,W504,B001,B008,B023,C812,C815,CFQ004,B019,B026,I100"
 exclude = "./vstutils/*/migrations/*,./vstutils/settings*.py,.tox/*,./etc/*,./*/__init__.py,./t_openstack.py,./vstutils/projects/*,vstutils/__main__.py,vstutils/compile.py"
 max-line-length = 120
 import-order-style = 'pep8'
diff --git a/requirements-prod.txt b/requirements-prod.txt
index 43b08fab..1eef07ae 100644
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -2,6 +2,6 @@
 # PyMySQL>=0.9.2,<=0.9.3; python_version<'3.0'
 # mysql-connector-python==8.0.15; python_version>'3.4'
 # Advanced cache support
-redis[hiredis]~=5.0.1
+redis[hiredis]~=5.0.3
 tarantool~=1.1.2
-pywebpush~=1.14.1
+pywebpush~=2.0.0
diff --git a/requirements-rpc.txt b/requirements-rpc.txt
index 13f3ffb7..4fb933d7 100644
--- a/requirements-rpc.txt
+++ b/requirements-rpc.txt
@@ -1,3 +1,3 @@
 # Packages needed for delayed jobs.
 celery[redis]==5.3.6
-django-celery-beat~=2.5.0
+django-celery-beat~=2.6.0
diff --git a/requirements-rtd.txt b/requirements-rtd.txt
index ba58e785..783f8323 100644
--- a/requirements-rtd.txt
+++ b/requirements-rtd.txt
@@ -1,7 +1,7 @@
 -rrequirements.txt
 -rrequirements-doc.txt
 -rrequirements-rpc.txt
-django~=4.2.10
-httpx>=0.26.0
+django~=5.0.3
+httpx>=0.27.0
 typing-extensions
 sphinx-intl~=2.1.0
diff --git a/requirements-test.txt b/requirements-test.txt
index cd037381..070113bf 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,6 +1,6 @@
 # Packages needed for test
-coverage~=7.4.1
+coverage~=7.4.4
 fakeldap~=0.6.6
 tblib==3.0.0
 beautifulsoup4~=4.12.3
-httpx~=0.26.0
+httpx~=0.27.0
diff --git a/requirements.txt b/requirements.txt
index 9f09a551..afee8e18 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ Markdown~=3.5.2
 django-environ~=0.11.2
 
 # REST API packages
-djangorestframework~=3.14.0
+djangorestframework~=3.15.0
 drf-yasg==1.21.7
 django-filter==23.5
 drf_orjson_renderer==1.7.1
@@ -12,7 +12,7 @@ ormsgpack~=1.4.2
 pyyaml~=6.0.1
 
 # web server
-uvicorn~=0.27.1
+uvicorn~=0.28.0
 pyuwsgi==2.0.23.post0
 # Restore it if some problems with pyuwsgi
 # uwsgi==2.0.23
diff --git a/setup.py b/setup.py
index 35a6a1e0..86cd4f74 100644
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@
         'vstutils/static/bundle/.*\.js$'
     ],
     install_requires=[
-        "django~=" + (os.environ.get('DJANGO_DEP', "") or "4.2.10"),
+        "django~=" + (os.environ.get('DJANGO_DEP', "") or "5.0.3"),
     ]
     + requirements
     + load_requirements('requirements-doc.txt'),
diff --git a/test_src/test_proj/migrations/0044_product_uniq_name_store.py b/test_src/test_proj/migrations/0044_product_uniq_name_store.py
index a79ccafa..007764b6 100644
--- a/test_src/test_proj/migrations/0044_product_uniq_name_store.py
+++ b/test_src/test_proj/migrations/0044_product_uniq_name_store.py
@@ -12,6 +12,6 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddConstraint(
             model_name='product',
-            constraint=models.UniqueConstraint(fields=('name', 'store'), name='uniq_name_store'),
+            constraint=models.UniqueConstraint(models.F('name'), models.F('store'), name='uniq_name_store'),
         ),
     ]
diff --git a/test_src/test_proj/migrations/0045_dynamicfields_generated_field.py b/test_src/test_proj/migrations/0045_dynamicfields_generated_field.py
new file mode 100644
index 00000000..43660da6
--- /dev/null
+++ b/test_src/test_proj/migrations/0045_dynamicfields_generated_field.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.0.3 on 2024-03-19 05:01
+
+import django.db.models.functions.text
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('test_proj', '0044_product_uniq_name_store'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='dynamicfields',
+            name='generated_field',
+            field=models.GeneratedField(db_persist=True, expression=django.db.models.functions.text.Upper('field_type'), output_field=models.CharField(max_length=100)),
+        ),
+    ]
diff --git a/test_src/test_proj/models/dynamic_fields.py b/test_src/test_proj/models/dynamic_fields.py
index a50ec780..73f7d855 100644
--- a/test_src/test_proj/models/dynamic_fields.py
+++ b/test_src/test_proj/models/dynamic_fields.py
@@ -1,4 +1,5 @@
 from django.db import models
+from django.db.models.functions import Upper
 from rest_framework.fields import CharField, IntegerField, ListField
 from rest_framework.serializers import Serializer
 from vstutils.api import fields
@@ -27,9 +28,14 @@ class AnotherSerializer(BaseSerializer):
 class DynamicFields(BModel):
     field_type = models.CharField(max_length=100)
     dynamic_with_types = models.CharField(max_length=500)
+    generated_field = models.GeneratedField(
+        expression=Upper('field_type'),
+        output_field=models.CharField(max_length=100),
+        db_persist=True,
+    )
 
     class Meta:
-        _list_fields = _detail_fields = ['id', 'field_type', 'dynamic_with_types']
+        _list_fields = _detail_fields = ['id', 'field_type', 'dynamic_with_types', 'generated_field']
         _override_list_fields = {
             'dynamic_with_types': fields.DynamicJsonTypeField(field='field_type', types={
                 'serializer': SomeSerializer(),
diff --git a/test_src/test_proj/models/nested_models.py b/test_src/test_proj/models/nested_models.py
index 16d3ced0..701ceabf 100644
--- a/test_src/test_proj/models/nested_models.py
+++ b/test_src/test_proj/models/nested_models.py
@@ -42,7 +42,7 @@ class Product(BaseModel):
     class Meta:
         default_related_name = 'products'
         constraints = [
-            models.UniqueConstraint(fields=['name', 'store'], name='uniq_name_store')
+            models.UniqueConstraint(models.F('name'), models.F('store'), name='uniq_name_store')
         ]
         _nested = {
             'options': {
diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index af2acb0f..d11311e7 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -23,7 +23,6 @@
 import ormsgpack
 import pytz
 from bs4 import BeautifulSoup
-from django import VERSION as django_version
 from django.apps import apps
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
@@ -2081,6 +2080,22 @@ def has_deep_parent_filter(params):
         # Check field without allow_blank will have minLength
         self.assertEqual(api['definitions']['OnePost']['properties']['text']['minLength'], 1)
 
+        # Check generated field type
+        self.assertDictEqual(api['definitions']['DynamicFields']['properties']['generated_field'], {
+            'type': 'string',
+            'title': 'Generated field',
+            'minLength': 1,
+            'maxLength': 100,
+            'readOnly': True,
+        })
+        self.assertDictEqual(api['definitions']['OneDynamicFields']['properties']['generated_field'], {
+            'type': 'string',
+            'title': 'Generated field',
+            'minLength': 1,
+            'maxLength': 100,
+            'readOnly': True,
+        })
+
         # Check dynamic field with complex types
         nested_model = {
             'type': 'object',
@@ -4479,6 +4494,7 @@ def test_dynamic_field_types(self):
 
         self.assertEqual(results[3]['status'], 201)
         self.assertEqual(results[3]['data']['dynamic_with_types'], 5)
+        self.assertEqual(results[3]['data']['generated_field'], results[3]['data']['field_type'].upper())
         self.assertEqual(results[4]['status'], 200)
         self.assertEqual(results[4]['data']['dynamic_with_types'], 5)
 
@@ -5131,7 +5147,7 @@ def test_custom_exception_messages(self):
                 'data': dict(
                     name='test prod',
                     store=store.id,
-                    price = 100,
+                    price=100,
                     manufacturer=manufacturer.id
                 )
             },
@@ -5716,6 +5732,7 @@ def test_file_reader(self):
             'NAME': 'file:memorydb_default?mode=memory&cache=shared',
             'TEST': {
                 'SERIALIZE': False,
+                'MIGRATE': True,
                 'CHARSET': None,
                 'COLLATION': None,
                 'NAME': None,
@@ -5730,8 +5747,6 @@ def test_file_reader(self):
             'HOST': '',
             'PORT': ''
         }
-        if django_version[0] >= 3 and django_version[1] in (1, 2):  # nocv
-            db_default_val['TEST']['MIGRATE'] = True
 
         self.assertEqual(settings.ALLOWED_HOSTS, ['*', 'testserver'])
 
diff --git a/tox.ini b/tox.ini
index 08e29dce..e8ad5a14 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = flake,mypy,pylint,bandit,py312-django42-coverage,py38-django42-install,builddoc
+envlist = flake,mypy,pylint,bandit,py312-django50-coverage,py310-django50-install,builddoc
 skipsdist = True
 allowlist_externals =
     rm
@@ -8,8 +8,8 @@ allowlist_externals =
 
 [gh-actions]
 python =
-    3.8: flake,mypy,pylint,bandit,py38-django42-install
-    3.12: py312-django42-coverage,builddoc
+    3.10: flake,mypy,pylint,bandit,py10-django50-install
+    3.12: py312-django50-coverage,builddoc
 
 [testenv]
 passenv = *
@@ -31,7 +31,7 @@ setenv =
     TEST_PROJ_MAIL_PORT = 26
     TEST_PROJ_UWSGI_LISTEN = 121
     UWSGI_PROFILE = minimal
-    django42: DJANGO_DEP =
+    django50: DJANGO_DEP =
     PYLINTHOME={envdir}/.pylint.d/
     install: export BUILD_OPTIMIZATION=true
     install: export BUILD_COMPILE=true
@@ -52,7 +52,7 @@ commands =
     coverage: pip install -U -e ..[all]
     coverage: python -m test_proj makemigrations vstutils vstutils_api vstutils_webpush --check
     coverage: coverage erase --rcfile={env:COVRC}
-    coverage: coverage run --rcfile={env:COVRC} {env:EXECUTE_ARGS} {posargs}
+    coverage: coverage run --rcfile={env:COVRC} {env:EXECUTE_ARGS} --durations 20 {posargs}
     coverage: coverage combine --rcfile={env:COVRC}
     coverage: coverage report --rcfile={env:COVRC}
     pip uninstall vstutils -y
@@ -69,7 +69,7 @@ deps =
 changedir = ./
 deps =
     flake8==6.1.0
-    flake8-bugbear==23.9.16
+    flake8-bugbear==24.2.6
     flake8-commas==2.1.0
     flake8-comprehensions==3.14.0
     flake8-django==1.4.0
@@ -77,19 +77,18 @@ deps =
     flake8-functions==0.0.8
     flake8-import-order==0.18.2
     Flake8-pyproject==1.2.3
-    # flake8-docstrings
 commands =
     flake8 vstutils
 
 [testenv:bandit]
 changedir = ./
 deps =
-    bandit[toml]==1.7.5
+    bandit[toml]==1.7.8
 commands =
     bandit -r vstutils -c pyproject.toml
 
 [testenv:mypy]
-basepython = python3.8
+basepython = python3.10
 changedir = ./
 setenv =
     DONT_YARN = true
@@ -101,13 +100,13 @@ commands =
     mypy -p vstutils
 
 [testenv:pylint]
-basepython = python3.8
+basepython = python3.10
 changedir = ./
 setenv =
     DONT_YARN = true
 deps =
-    pylint==2.17.5
-    pylint-django==2.5.3
+    pylint==3.1.0
+    pylint-django==2.5.5
     pylint-plugin-utils==0.8.2
     -rrequirements-git.txt
 commands =
@@ -146,7 +145,7 @@ deps =
     -rrequirements-rtd.txt
 
 [testenv:build]
-basepython = python3.8
+basepython = python3.10
 passenv = *
 changedir = .
 allowlist_externals =
@@ -158,7 +157,7 @@ commands =
 deps =
 
 [testenv:contrib]
-basepython = python3.8
+basepython = python3.10
 skipsdist = False
 usedevelop = True
 envdir = {toxinidir}/env
diff --git a/tox_build.ini b/tox_build.ini
index 8df3bc1e..e8c827c0 100644
--- a/tox_build.ini
+++ b/tox_build.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py38-build,py31{1,2}-wheel,auditwheel
+envlist = py310-build,py31{1,2}-wheel,auditwheel
 skipsdist = True
 
 [testenv]
diff --git a/vstutils/api/endpoint.py b/vstutils/api/endpoint.py
index 350d101a..4dd78ab8 100644
--- a/vstutils/api/endpoint.py
+++ b/vstutils/api/endpoint.py
@@ -80,8 +80,7 @@ def handler(operation):
         return operation_handler(operation, context)
 
     with executor_class(max_workers=THREADS_COUNT) as executor:
-        for operation_result in executor.map(handler, _get_request_data(request.data)):
-            yield operation_result
+        yield from executor.map(handler, _get_request_data(request.data))
 
 
 def _join_paths(*args) -> _t.Text:
diff --git a/vstutils/api/health.py b/vstutils/api/health.py
index fe35d553..914b59a4 100644
--- a/vstutils/api/health.py
+++ b/vstutils/api/health.py
@@ -13,7 +13,7 @@ def health_wrapper(method):
     def wrapper(self):
         try:
             return method(self) or 'ok', st.HTTP_200_OK
-        except BaseException as exception:
+        except Exception as exception:
             code = getattr(exception, 'status', st.HTTP_500_INTERNAL_SERVER_ERROR)
             return str(exception), code
 
@@ -44,8 +44,7 @@ def get(self) -> Tuple[Dict, int]:
         result, status = {}, st.HTTP_200_OK
         for key, method in self.health_checks.items():
             result[key], method_status = method(self)
-            if method_status > status:
-                status = method_status
+            status = max(status, method_status)
         return result, status
 
 
diff --git a/vstutils/api/schema/inspectors.py b/vstutils/api/schema/inspectors.py
index 1549fcda..34591bb0 100644
--- a/vstutils/api/schema/inspectors.py
+++ b/vstutils/api/schema/inspectors.py
@@ -388,12 +388,12 @@ class NamedBinaryImageInJsonFieldInspector(FieldInspector):
                 x_nullable=v is None,
             )
             for k, v in fields.DEFAULT_NAMED_FILE_DATA.items()
-        }
+        },
     }
 
     default_multiple_schema_data = {
         'type': openapi.TYPE_ARRAY,
-        'items': openapi.Items(**default_schema_data)  # type: ignore
+        'items': openapi.Items(**default_schema_data),  # type: ignore
     }
 
     def field_to_swagger_object(self, field, swagger_object_type, use_references, **kw):
diff --git a/vstutils/api/serializers.py b/vstutils/api/serializers.py
index b9f68e40..23979493 100644
--- a/vstutils/api/serializers.py
+++ b/vstutils/api/serializers.py
@@ -4,7 +4,7 @@
 Read more in Django REST Framework documentation for
 `Serializers <https://www.django-rest-framework.org/api-guide/serializers/>`_.
 """
-
+import copy
 import typing as _t
 
 import orjson
@@ -172,13 +172,25 @@ class Meta:
     })
 
     def build_standard_field(self, field_name, model_field):
-        field_class, field_kwargs = super().build_standard_field(field_name, model_field)
+        if isinstance(model_field, models.GeneratedField):
+            model_field_copy = copy.copy(model_field.output_field)
+            model_field_copy.model = model_field.model
+            field_class, field_kwargs = super().build_standard_field(field_name, model_field_copy)
+            field_kwargs['read_only'] = True
+        else:
+            field_class, field_kwargs = super().build_standard_field(field_name, model_field)
+
         if isinstance(model_field, models.FileField) and issubclass(field_class, fields.NamedBinaryFileInJsonField):
             field_kwargs['file'] = True
             if model_field.max_length:
                 field_kwargs['max_length'] = model_field.max_length
                 if isinstance(model_field.upload_to, str):
                     field_kwargs['max_length'] -= len(model_field.upload_to)
+
+        if issubclass(field_class, fields.NamedBinaryFileInJsonField) and isinstance(model_field, models.TextField):
+            if isinstance(model_field.default, str):
+                field_kwargs['default'] = orjson.loads(model_field.default) if model_field.default else drf_fields.empty
+
         return field_class, field_kwargs
 
     def build_relational_field(self, field_name, relation_info):
diff --git a/vstutils/management/commands/rpc_worker.py b/vstutils/management/commands/rpc_worker.py
index 3ea5b828..ae3c2499 100644
--- a/vstutils/management/commands/rpc_worker.py
+++ b/vstutils/management/commands/rpc_worker.py
@@ -98,7 +98,7 @@ def handle(self, *args, **options):  # nocv
                     raise exc
         except KeyboardInterrupt:  # nocv
             self._print('Exit by user...', 'WARNING')
-        except BaseException as err:  # nocv
-            self._print(traceback.format_exc())
-            self._print(str(err), 'ERROR')
-            sys.exit(1)
+        except BaseException as err:  # noqa: B036
+            self._print(traceback.format_exc())  # nocv
+            self._print(str(err), 'ERROR')  # nocv
+            sys.exit(1)  # nocv
diff --git a/vstutils/models/fields.py b/vstutils/models/fields.py
index 5500e4b9..bc16a21d 100644
--- a/vstutils/models/fields.py
+++ b/vstutils/models/fields.py
@@ -208,7 +208,7 @@ class MultipleImageField(MultipleFileMixin, ImageField):
     description = "List of Images"
 
     def update_dimension_fields(self, instance, force=False, *args, **kwargs):
-        pass
+        pass  # nocv
 
 
 class NamedBinaryFileInJSONField(TextField):
diff --git a/vstutils/tests.py b/vstutils/tests.py
index b44a160f..1efd8a03 100644
--- a/vstutils/tests.py
+++ b/vstutils/tests.py
@@ -100,7 +100,7 @@ def _login(self):
         return client
 
     def _logout(self, client):
-        self.assertEqual(client.get(self.logout_url).status_code, 302)
+        self.assertEqual(client.post(self.logout_url).status_code, 302)
 
     def _check_update(self, url, data, **fields):
         """
diff --git a/vstutils/utils.py b/vstutils/utils.py
index f44fff86..0e6e781a 100644
--- a/vstutils/utils.py
+++ b/vstutils/utils.py
@@ -1260,8 +1260,7 @@ def opts(self, name):
 
     def get_static_objects(self):
         for name in self.keys():
-            for result in self.get_object(name).spa_static_list:
-                yield result
+            yield from self.get_object(name).spa_static_list
 
     def get_sorted_list(self):
         return tuple(multikeysort(self.get_static_objects(), ['priority']))

From 210d6416b22ae57b4a894a6420f0a8082e8c1804 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Tue, 19 Mar 2024 22:38:28 -0700
Subject: [PATCH 02/46] Fix(backend): Exception on EmptyResultSet for recursive
 queries.

Closes vst/vst-utils#642
---
 test_src/test_proj/tests.py |  5 +++++
 vstutils/models/queryset.py | 16 +++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index d11311e7..b10f7f35 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -5245,6 +5245,11 @@ def test_deep_nested(self):
 
     def test_m2m_fk_deep_nested(self):
         Group = self.get_model_class('test_proj.Group')
+
+        # check empty result set
+        qs = Group.objects.filter(id__in=()).get_children(True)
+        self.assertTrue(qs.query.is_empty())
+
         results = self.bulk([
             {'method': 'post', 'path': 'group', 'data': {'name': '1'}},
             {'method': 'post', 'path': ['group', '<<0[data][id]>>', 'childrens'], 'data': {'name': '1.1'}},
diff --git a/vstutils/models/queryset.py b/vstutils/models/queryset.py
index f8b4a5bc..837fbf1d 100644
--- a/vstutils/models/queryset.py
+++ b/vstutils/models/queryset.py
@@ -4,6 +4,7 @@
 
 from django.db import models
 from django.db.models.expressions import RawSQL
+from django.core.exceptions import EmptyResultSet
 from django.utils.functional import cached_property, lazy
 from django.conf import settings
 
@@ -146,12 +147,19 @@ def _get_deep_nested_qs_with_cte(self, with_current=False, deep_children=True):
         initial_qs.query.clear_select_fields()
         initial_qs.query.clear_select_clause()
         initial_qs = initial_qs.values(origin_model_pk)
+        initial_qs.query.clear_limits()
+
+        try:
+            initial_sql = str(initial_qs.query)
+        except EmptyResultSet:
+            return initial_qs.none()
+
         sql = ' '.join((
             'WITH RECURSIVE NRQ777 as (',
                     f'SELECT NU777.{sql_column_to_get}, NU777.{sql_deep_column}',  # noqa: E131
                     f'FROM {sql_table} NU777',
                     f'WHERE NU777.{sql_deep_column}',
-                        f'IN ({str(initial_qs.query)})',  # noqa: E131
+                        f'IN ({initial_sql})',  # noqa: E131
                 'UNION',  # noqa: E131
                     f'SELECT NU777_1.{sql_column_to_get}, NU777_1.{sql_deep_column}',
                     f'FROM {sql_table} NU777_1',
@@ -162,8 +170,10 @@ def _get_deep_nested_qs_with_cte(self, with_current=False, deep_children=True):
         ))
 
         if with_current:
-            sql += f' UNION {initial_qs.query}'
-        return self.model.objects.filter(id__in=RawSQL(sql, []))  # nosec
+            sql += f' UNION {initial_sql}'
+        chain = self.model.objects.filter(id__in=RawSQL(sql, []))  # nosec
+        chain.query.set_limits(self.query.low_mark, self.query.high_mark)
+        return chain
 
     def _deep_nested_ids_without_cte(self, accumulated=None, deep_children=True):
         deep_parent_field = self.model.deep_parent_field

From 121c0d56cf5d316e4f063ea8eacf5ae336ce0b1b Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Tue, 19 Mar 2024 22:57:29 -0700
Subject: [PATCH 03/46] Fix(backend): Add enum values for django filters.

Closes vst/vst-utils#643
---
 vstutils/api/filter_backends.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vstutils/api/filter_backends.py b/vstutils/api/filter_backends.py
index e58a79d4..d69b2d38 100644
--- a/vstutils/api/filter_backends.py
+++ b/vstutils/api/filter_backends.py
@@ -42,14 +42,14 @@ def get_openapi_field_schema(self, field_name, field, queryset):
             field_type = openapi.TYPE_NUMBER
         elif isinstance(field, filters.BooleanFilter):
             field_type = openapi.TYPE_BOOLEAN
-        elif isinstance(field, filters.ChoiceFilter):
+        elif isinstance(field, (filters.ChoiceFilter, filters.MultipleChoiceFilter)):
             kwargs['enum'] = tuple(dict(field.field.choices).keys())
         elif field_name in {'id', 'id__not'}:
             search_field = field_name.split('__')[0]
             m_field = next((f for f in queryset.model._meta.fields if f.name == search_field), None)
             field_type, kwargs_update = get_field_type_from_queryset(m_field)
 
-        if field.method == extra_filter:
+        if field.method == extra_filter or isinstance(field, (filters.MultipleChoiceFilter, filters.BaseCSVFilter)):
             kwargs = {
                 'items': {
                     'type': field_type,

From a823337c9af9579a8b3a4ac4fe6e6bf1a3bdda75 Mon Sep 17 00:00:00 2001
From: Alexander Vyaznikov <alexnder.vyaznikov@yandex.ru>
Date: Wed, 3 Apr 2024 16:06:38 +1000
Subject: [PATCH 04/46] Fix(backend): Fixed popUp translations

---
 frontend_src/vstutils/popUp/PopUp.js | 19 ++++++++++---------
 vstutils/translations/cn.py          | 12 ++++++++----
 vstutils/translations/ru.py          | 12 ++++++++----
 vstutils/translations/vi.py          | 12 ++++++++----
 4 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/frontend_src/vstutils/popUp/PopUp.js b/frontend_src/vstutils/popUp/PopUp.js
index 8175b65d..8487cd1e 100644
--- a/frontend_src/vstutils/popUp/PopUp.js
+++ b/frontend_src/vstutils/popUp/PopUp.js
@@ -1,4 +1,5 @@
 import iziToast from 'izitoast';
+import { i18n } from '@/vstutils/translation';
 
 /**
  * Class, that is responsible for showing of pop up notification.
@@ -62,7 +63,11 @@ export class PopUp {
      */
     _generatePopUp(type = 'show', message = '', opt = {}) {
         opt.message = message;
-        return this._showPopUp(type, this._getPopUpSettings(type, opt));
+        const settings = this._getPopUpSettings(type, opt);
+        if (settings.title) {
+            settings.title = i18n.t(settings.title);
+        }
+        return this._showPopUp(type, settings);
     }
     /**
      * Method, that generates default pop up notification.
@@ -164,8 +169,8 @@ export let pop_up_msg = {
             remove: '<b>{1}</b> "<b>{0}</b>" was successfully removed.',
             removeMany: 'Selected instances were successfully removed',
             save: 'Changes in <b>{1}</b> <b>{0}</b> were successfully saved.',
-            executeEmpty: 'Action <b>{0}</b> was successfully executed' + ' on <b>{1}</b>.<br>{2}',
-            execute: 'Action <b>{0}</b> was successfully executed.<br>{1}',
+            executeEmpty: 'Action <b>{0}</b> was successfully executed on <b>{1}</b>.<br>{2}',
+            execute: 'Action <b>{0}</b> was successfully executed on <b>{1}</b>.<br>{2}',
         },
         error: {
             add:
@@ -173,15 +178,11 @@ export let pop_up_msg = {
                 ' to parent list.' +
                 '<br> Error details: {1}',
             create: 'An error occurred during creation.<br>Error details:<br>{0}',
-            remove:
-                'An error occurred during removal process of <b>{1}</b>  "<b>{0}</b>".' +
-                '<br> Error details: {2}',
+            remove: 'An error occurred during removal process of <b>{1}</b>  "<b>{0}</b>". <br> Error details: {2}',
             removeMany: 'An error occurred during removal process. Error details: {0}',
             save: 'An error occurred during process.<br>Error details:<br>{0}',
             executeEmpty:
-                'Some error occurred during <b>{0}</b> action execution on <b>{1}</b>.' +
-                '<br> Error details: {2}' +
-                '<br>{3}',
+                'Some error occurred during <b>{0}</b> action execution on <b>{1}</b>. <br> Error details: {2} <br>{3}',
             execute: 'An error occurred during <b>{0}</b>. Error details:<br>{1}',
         },
     },
diff --git a/vstutils/translations/cn.py b/vstutils/translations/cn.py
index 213a49b8..bcaf562a 100644
--- a/vstutils/translations/cn.py
+++ b/vstutils/translations/cn.py
@@ -229,22 +229,26 @@
     # create
     'New "<b>{0}</b>" instance was successfully created.': '新对象“ <b> {0} </ b>”已成功创建.',
     # remove
-    '"<b>{0}</b>" {1} was successfully removed.': '"<b>{0}</b>" {1} 已成功删除."',
+    '<b>{1}</b> "<b>{0}</b>" was successfully removed.': '<b>{1}</b> "<b>{0}</b>" 已成功删除."',
     # save
-    'Changes in "<b>{0}</b>" {1} were successfully saved.': '对象变化{1}“ <b> {0} </ b>”的更改已成功保存.',
+    'Changes in <b>{1}</b> <b>{0}</b> were successfully saved.': '对象变化 <b>{1}</b> <b>{0}</b>”的更改已成功保存.',
     # execute
-    'Action "<b>{0}</b>" was successfully executed on "<b>{1}</b>" instance.': '在对象“ <b> {1} </ b>”上成功启动了操作“ <b> {0} </ b>”。',
+    'Action <b>{0}</b> was successfully executed on <b>{1}</b>.<br>{2}': '在对象 <b>{0}</b> 上成功启动了操作 <b>{1}</b>.<br>{2}',
     # instance operation error
     # add:
     'An error occurred during adding of child "<b>{0}</b>" instance to parent list.<br> Error details: {1}': '将对象“ <b> {0} </ b>”添加到目级列表时发生错误。<br>更多详细信息：{1}',
     # create:
     'An error occurred during creation.<br>Error details:<br>{0}': '创建新对象时发生错误<br>更多详细信息：{0}',
     # remove:
-    'An error occurred during removal process of "<b>{0}</b>" {1}.<br> Error details: {2}': '删除{1}“ <b> {0} </ b>”时发生错误<br>更多详细信息：{2}',
+    'An error occurred during removal process of <b>{1}</b>  "<b>{0}</b>". <br> Error details: {2}': '删除{1}“ <b> {0} </ b>”时发生错误<br>更多详细信息：{2}',
+    # removeMany:
+    'An error occurred during removal process. Error details: {0}': '刪除過程中發生錯誤。錯誤詳細資訊：{0}',
     # save:
     'An error occurred during process.<br>Error details:<br>{0}': '保存时发生错误。<br>更多详细信息：{0}',
     # execute:
     'An error occurred during <b>{0}</b>. Error details:<br>{1}': '<b>{0}</b> 期间发生了一些错误。 错误详情：<br>{1}',
+    # Execute Empty:
+    'Some error occurred during <b>{0}</b> action execution on <b>{1}</b>. <br> Error details: {2} <br>{3}': '<b>{1}</b> 上的 <b>{0}</b> 操作執行期間發生了一些錯誤。 <br>錯誤詳細資料：{2} <br>{3}',
     'Link': '链接',
 
     # csv
diff --git a/vstutils/translations/ru.py b/vstutils/translations/ru.py
index 4a34a657..c1a7335d 100644
--- a/vstutils/translations/ru.py
+++ b/vstutils/translations/ru.py
@@ -228,22 +228,26 @@
     # create
     'New "<b>{0}</b>" instance was successfully created.': 'Новый объект "<b>{0}</b>" был успешно создан.',
     # remove
-    '"<b>{0}</b>" {1} was successfully removed.': '"<b>{0}</b>" {1} был(а) успешно удален.',
+    '<b>{1}</b> "<b>{0}</b>" was successfully removed.': '<b>{1}</b> "<b>{0}</b>" был(а) успешно удален.',
     # save
-    'Changes in "<b>{0}</b>" {1} were successfully saved.': 'Изменения в объекте {1} "<b>{0}</b>" были успешно сохранены.',
+    'Changes in <b>{1}</b> <b>{0}</b> were successfully saved.': 'Изменения в объекте <b>{1}</b> <b>{0}</b> были успешно сохранены.',
     # execute
-    'Action "<b>{0}</b>" was successfully executed on "<b>{1}</b>" instance.': 'Действие "<b>{0}</b>" было успешно запущено на объекте "<b>{1}</b>".',
+    'Action <b>{0}</b> was successfully executed on <b>{1}</b>.<br>{2}': 'Действие <b>{0}</b> было успешно запущено на объекте <b>{1}</b>.<br>{2}',
     # instance operation error
     # add:
     'An error occurred during adding of child "<b>{0}</b>" instance to parent list.<br> Error details: {1}': 'Во время добавления дочернего объекта "<b>{0}</b>" к родительскому списку произошла ошибка.<br> Подробнее: {1}',
     # create:
     'An error occurred during creation.<br>Error details:<br>{0}': 'Во время создания нового объекта произошла ошибка.<br>Подробнее:<br>{0}',
     # remove:
-    'An error occurred during removal process of "<b>{0}</b>" {1}.<br> Error details: {2}': 'Во время удаления {1} "<b>{0}</b>" произошла ошибка.<br> Подробнее: {2}',
+    'An error occurred during removal process of <b>{1}</b>  "<b>{0}</b>". <br> Error details: {2}': 'Во время удаления {1} "<b>{0}</b>" произошла ошибка. <br> Подробнее: {2}',
+    # removeMany:
+    'An error occurred during removal process. Error details: {0}': 'Во время удаления произошла ошибка. Подробнее: {0}',
     # save:
     'An error occurred during process.<br>Error details:<br>{0}': 'Во время сохранения произошла ошибка.<br>Подробнее:<br>{0}',
     # execute:
     'An error occurred during <b>{0}</b>. Error details:<br>{1}': 'Во время запуска действия <b>{0}</b> произошла ошибка. Подробнее:<br>{1}',
+    # Execute Empty:
+    'Some error occurred during <b>{0}</b> action execution on <b>{1}</b>. <br> Error details: {2} <br>{3}': 'Произошла ошибка во время выполнения действия <b>{0}</b> на <b>{1}</b>. <br> Подробнее: {2} <br>{3}',
     'Link': 'Ссылка',
     # csv
     'Actions': 'Действия',
diff --git a/vstutils/translations/vi.py b/vstutils/translations/vi.py
index 9872b0db..333323c2 100644
--- a/vstutils/translations/vi.py
+++ b/vstutils/translations/vi.py
@@ -229,22 +229,26 @@
     # create
     'New "<b>{0}</b>" instance was successfully created.': 'Đối tượng mới "<b> {0} </b>" đã được tạo thành công.',
     # remove
-    '"<b>{0}</b>" {1} was successfully removed.': '"<b>{0}</b>" {1} đã được xóa thành công."',
+    '<b>{1}</b> "<b>{0}</b>" was successfully removed.': '<b>{1}</b> "<b>{0}</b>" đã được xóa thành công."',
     # save
-    'Changes in "<b>{0}</b>" {1} were successfully saved.': 'Thay đổi đối tượng {1} "<b> {0} </ b>" đã được lưu thành công.',
+    'Changes in <b>{1}</b> <b>{0}</b> were successfully saved.': 'Thay đổi đối tượng <b>{1}</b> <b>{0}</b> đã được lưu thành công.',
     # execute
-    'Action "<b>{0}</b>" was successfully executed on "<b>{1}</b>" instance.': 'Thao tác "<b> {0} </b>" đã được thực hiện thành công trên đối tượng "<b> {1} </b>".',
+    'Action <b>{0}</b> was successfully executed on <b>{1}</b>.<br>{2}': 'Thao tác "<b> {0} </b>" đã được thực hiện thành công trên đối tượng <b>{1}</b>.<br>{2}',
     # instance operation error
     # add:
     'An error occurred during adding of child "<b>{0}</b>" instance to parent list.<br> Error details: {1}': 'Khi thêm đối tượng con "<b> {0} </b>" vào danh sách mẹ đã xảy ra lỗi <br> thêm chi tiết: {1}',
     # create:
     'An error occurred during creation.<br>Error details:<br>{0}': 'Đã xảy ra một số lỗi khi tạo phiên bản mới. <br> Chi tiết lỗi: <br> {0}',
     # remove:
-    'An error occurred during removal process of "<b>{0}</b>" {1}.<br> Error details: {2}': 'Khi xóa {1} "<b> {0} </b>". đã xảy ra lỗi <br> thêm chi tiết: {2}',
+    'An error occurred during removal process of <b>{1}</b>  "<b>{0}</b>". <br> Error details: {2}': 'Khi xóa {1} "<b> {0} </b>". đã xảy ra lỗi <br> thêm chi tiết: {2}',
+    # removeMany:
+    'An error occurred during removal process. Error details: {0}': 'Đã xảy ra lỗi trong quá trình xóa. Chi tiết lỗi: {0}',
     # save:
     'An error occurred during process.<br>Error details:<br>{0}': 'Đã xảy ra một số lỗi trong quá trình lưu. <br> Chi tiết lỗi: <br> {0}',
     # execute:
     'An error occurred during <b>{0}</b>. Error details:<br>{1}': 'Đã xảy ra một số lỗi trong <b> {0} </b>. Chi tiết lỗi: <br> {1}',
+    # Execute Empty:
+    'Some error occurred during <b>{0}</b> action execution on <b>{1}</b>. <br> Error details: {2} <br>{3}': 'Đã xảy ra một số lỗi trong quá trình thực thi hành động <b>{0</b> trên <b>{1</b>. <br> Chi tiết lỗi: {2} <br>{3}',
     'Link': 'Liên kết',
 
     # csv

From ee1a9825d13d6f67cb74ea4124730dd22497db9c Mon Sep 17 00:00:00 2001
From: Alexander Vyaznikov <alexnder.vyaznikov@yandex.ru>
Date: Wed, 10 Apr 2024 15:38:38 +1000
Subject: [PATCH 05/46] Fix(frontend): Fixed card word break

---
 frontend_src/vstutils/AppRoot.vue         | 3 +++
 frontend_src/vstutils/components/Card.vue | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/frontend_src/vstutils/AppRoot.vue b/frontend_src/vstutils/AppRoot.vue
index 96a29d65..10dc37cd 100644
--- a/frontend_src/vstutils/AppRoot.vue
+++ b/frontend_src/vstutils/AppRoot.vue
@@ -211,6 +211,9 @@
 </script>
 
 <style>
+    .content-wrapper {
+        overflow: hidden;
+    }
     .control-sidebar-enter,
     .control-sidebar-leave-to {
         right: -300px !important;
diff --git a/frontend_src/vstutils/components/Card.vue b/frontend_src/vstutils/components/Card.vue
index b456343a..e96140ff 100644
--- a/frontend_src/vstutils/components/Card.vue
+++ b/frontend_src/vstutils/components/Card.vue
@@ -47,6 +47,9 @@
 </script>
 
 <style scoped>
+    .card {
+        word-break: break-all;
+    }
     .card-header {
         display: flex;
         align-items: center;

From f7128b2a414640043567b3b2831b4415c0eed792 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Tue, 14 May 2024 17:16:44 -0700
Subject: [PATCH 06/46] Feature(backend): Provide support for json files as
 arguments to ``run_task``.

---
 test_src/test_proj/run_task_file_example.json | 2 ++
 test_src/test_proj/tests.py                   | 2 +-
 vstutils/management/commands/run_task.py      | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 test_src/test_proj/run_task_file_example.json

diff --git a/test_src/test_proj/run_task_file_example.json b/test_src/test_proj/run_task_file_example.json
new file mode 100644
index 00000000..408aea79
--- /dev/null
+++ b/test_src/test_proj/run_task_file_example.json
@@ -0,0 +1,2 @@
+{"name": "test host obj"}
+
diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index b10f7f35..6789d1bc 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -6046,7 +6046,7 @@ def test_task_class_executor(self):
             'run_task',
             '--sync',
             interactive=0,
-            kwargs=json.dumps({'name': "test host obj"}),
+            kwargs=os.path.join(os.path.dirname(__file__), 'run_task_file_example.json'),
             task='test_proj.tasks.CreateHostTask'
         )
         self.assertEqual(Host.objects.order_by('-id').first().name, 'test host obj')
diff --git a/vstutils/management/commands/run_task.py b/vstutils/management/commands/run_task.py
index 41f82a79..c0e4443c 100644
--- a/vstutils/management/commands/run_task.py
+++ b/vstutils/management/commands/run_task.py
@@ -1,3 +1,4 @@
+import pathlib
 import json
 import sys
 
@@ -50,7 +51,10 @@ def handle(self, *args, **options):
         task = options['task']
         self._print(f'Run "{task}"', 'WARNING')
 
-        kwargs, task = self._parse_arg(json.loads, options['kwargs']), self._parse_arg(import_string, options['task'])()
+        opt_kwargs = options['kwargs'].strip()
+        if not (opt_kwargs.startswith('{') and opt_kwargs.endswith('}')):
+            opt_kwargs = pathlib.Path(opt_kwargs).read_text('utf-8').strip()
+        kwargs, task = self._parse_arg(json.loads, opt_kwargs), self._parse_arg(import_string, options['task'])()
         task_result: AsyncResult = self._parse_arg(task.apply if options['sync'] else task.apply_async, kwargs=kwargs)
 
         self._print(f'Task "{task}" is executed with id "{task_result.task_id}".', 'SUCCESS')

From cd048c243c553eee1280d0c5d48c8719b2f8c691 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite@mail.ru>
Date: Fri, 24 May 2024 12:52:55 +1000
Subject: [PATCH 07/46] Feature(backend): Provide new ``SimpleFileAction`` for
 file response operations.

---
 doc/conf.py                                |   2 +-
 doc/locale/ru/LC_MESSAGES/backend.po       |  72 ++++++++-
 test_src/test_proj/models/nested_models.py |   5 -
 test_src/test_proj/tests.py                |  36 +++++
 test_src/test_proj/views.py                |  24 ++-
 vstutils/api/actions.py                    | 163 +++++++++++++++++++++
 vstutils/api/actions.pyi                   |  47 ++++++
 vstutils/api/base.py                       |   7 +-
 vstutils/api/schema/schema.py              |   8 +-
 vstutils/exceptions.py                     |   8 +-
 10 files changed, 349 insertions(+), 23 deletions(-)

diff --git a/doc/conf.py b/doc/conf.py
index 53047094..d1968abf 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -256,7 +256,7 @@
 
 intersphinx_mapping = {
     'django': (django_version_docs, django_version_docs + '_objects/'),
-    'python': ('https://docs.python.org/3.8', None),
+    'python': ('https://docs.python.org/3.10', None),
 }
 extlinks = {
     'wiki': ('https://en.wikipedia.org/wiki/%s', None),
diff --git a/doc/locale/ru/LC_MESSAGES/backend.po b/doc/locale/ru/LC_MESSAGES/backend.po
index 0040de02..9ca2a268 100644
--- a/doc/locale/ru/LC_MESSAGES/backend.po
+++ b/doc/locale/ru/LC_MESSAGES/backend.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VST Utils 5.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-13 07:08+0000\n"
+"POT-Creation-Date: 2024-05-23 06:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.12.1\n"
+"Generated-By: Babel 2.15.0\n"
 
 #: ../../backend.rst:2
 msgid "Backend API manual"
@@ -61,10 +61,10 @@ msgstr ""
 "для list() и retrieve(), фильтры, api endpoint-ы и вложенные view."
 
 #: of vstutils.api.actions.Action:5 vstutils.api.actions.EmptyAction:9
-#: vstutils.api.actions.SimpleAction:20 vstutils.api.base.ModelViewSet:31
-#: vstutils.api.fields.DeepFkField:37 vstutils.api.fields.FkField:37
-#: vstutils.models.BModel:162 vstutils.models.BModel:187
-#: vstutils.models.custom_model.FileModel:20
+#: vstutils.api.actions.SimpleAction:20 vstutils.api.actions.SimpleFileAction:7
+#: vstutils.api.base.ModelViewSet:31 vstutils.api.fields.DeepFkField:37
+#: vstutils.api.fields.FkField:37 vstutils.models.BModel:162
+#: vstutils.models.BModel:187 vstutils.models.custom_model.FileModel:20
 #: vstutils.models.custom_model.ListModel:16
 #: vstutils.models.custom_model.ListModel:35
 msgid "Examples:"
@@ -681,7 +681,9 @@ msgstr "high_mark (int): Верхний индекс для среза (если
 msgid "is_sliced (bool): A boolean indicating whether the query is sliced."
 msgstr "is_sliced (bool): Булево значение, указывающее, является ли запрос срезом."
 
-#: of vstutils.api.actions.Action
+#: of vstutils.api.actions.Action vstutils.api.actions.SimpleFileAction
+#: vstutils.api.actions.SimpleFileAction.modified_since
+#: vstutils.api.actions.SimpleFileAction.pre_data
 #: vstutils.api.base.GenericViewSet.create_action_serializer
 #: vstutils.api.base.GenericViewSet.get_query_serialized_data
 #: vstutils.api.base.check_request_etag vstutils.api.base.get_etag_value
@@ -756,7 +758,9 @@ msgstr "Параметры"
 msgid "An object containing filtering, limiting, and sorting parameters."
 msgstr "Объект, содержащий параметры фильтрации, лимитирования и сортировки."
 
-#: of vstutils.api.base.GenericViewSet.create_action_serializer
+#: of vstutils.api.actions.SimpleFileAction.modified_since
+#: vstutils.api.actions.SimpleFileAction.pre_data
+#: vstutils.api.base.GenericViewSet.create_action_serializer
 #: vstutils.api.base.check_request_etag vstutils.api.base.get_etag_value
 #: vstutils.api.filters.extra_filter vstutils.api.filters.name_filter
 #: vstutils.api.validators.resize_image
@@ -3962,6 +3966,58 @@ msgid ""
 msgstr ""
 "При назначении действия на объект список методов также заполняется "
 "необходимыми методами."
+#: of vstutils.api.actions.SimpleFileAction:1
+msgid ""
+"Action for handling file responses. This action always returns a "
+"FileResponse."
+msgstr "Экшен для обработки ответов с файлами. Это действие всегда возвращает FileResponse."
+
+#: of vstutils.api.actions.SimpleFileAction:3
+msgid ""
+"This class is designed to simplify the process of creating actions that "
+"return file responses. It ensures that the file is only sent if it has "
+"been modified since the client's last request, and it sets appropriate "
+"headers to facilitate caching and attachment handling."
+msgstr "Этот класс предназначен для упрощения процесса создания действий, возвращающих ответы с файлами. Он гарантирует, что файл отправляется только в случае его изменения с момента последнего запроса клиента, и устанавливает соответствующие заголовки для облегчения кэширования и обработки вложений."
+
+#: of vstutils.api.actions.SimpleFileAction:62
+msgid "Cache-Control header value. Defaults to 'max-age=3600'."
+msgstr "Значение заголовка Cache-Control. По умолчанию 'max-age=3600'."
+
+#: of vstutils.api.actions.SimpleFileAction:64
+msgid ""
+"Boolean indicating if the file should be sent as an attachment. Defaults "
+"to False."
+msgstr "Булево значение, указывающее, следует ли отправлять файл в виде вложения. По умолчанию False."
+
+#: of vstutils.api.actions.SimpleFileAction:66
+msgid "Additional named arguments for :func:`rest_framework.decorators.action`."
+msgstr "Набор именованных аргументов для :func:`rest_framework.decorators.action`."
+#: of vstutils.api.actions.SimpleFileAction.modified_since:1
+msgid "Default modified_since method that checks the modification time of a file."
+msgstr "Метод modified_since по умолчанию, который проверяет время изменения файла."
+
+#: of vstutils.api.actions.SimpleFileAction.modified_since:4
+#: vstutils.api.actions.SimpleFileAction.pre_data:4
+msgid "The view instance."
+msgstr "Экземпляр представления."
+
+#: of vstutils.api.actions.SimpleFileAction.modified_since:6
+#: vstutils.api.actions.SimpleFileAction.pre_data:6
+msgid "The file object, typically a FileField or ImageField."
+msgstr "Объект файла, обычно FileField или ImageField."
+
+#: of vstutils.api.actions.SimpleFileAction.modified_since:8
+msgid "The modification time of the file, or None if it cannot be determined."
+msgstr "Время изменения файла или None, если оно не может быть определено."
+
+#: of vstutils.api.actions.SimpleFileAction.pre_data:1
+msgid "Default pre_data method that returns the file, its name, and content type."
+msgstr "Метод pre_data по умолчанию, который возвращает файл, его имя и тип содержимого."
+
+#: of vstutils.api.actions.SimpleFileAction.pre_data:8
+msgid "A tuple containing the file, its name, and its content type."
+msgstr "Кортеж, содержащий файл, его имя и тип содержимого."
 
 #: ../../backend.rst:127
 msgid "Filtersets"
diff --git a/test_src/test_proj/models/nested_models.py b/test_src/test_proj/models/nested_models.py
index 701ceabf..f40ae70e 100644
--- a/test_src/test_proj/models/nested_models.py
+++ b/test_src/test_proj/models/nested_models.py
@@ -1,10 +1,5 @@
 from django.db import models
-from django.dispatch import receiver
-from django.db.models.signals import pre_delete
-from django.core.validators import ValidationError
 from rest_framework.permissions import BasePermission
-from rest_framework.request import Request
-from rest_framework.views import APIView
 
 from vstutils.models import BaseModel
 
diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index 6789d1bc..dff6a431 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -37,6 +37,7 @@
 except ImportError:  # nocv
     from django.middleware.csrf import _get_new_csrf_string as _get_new_csrf_token
 from django.core.cache import cache
+from django.utils.http import http_date
 from django.contrib.auth.hashers import make_password
 from django.contrib.auth import get_user_model
 from django.test import Client
@@ -4143,6 +4144,15 @@ def test_swagger_schema(self):
         self.assertIn('Etag', data['paths']['/cacheable/{id}/']['put']['responses']['200']['headers'])
         self.assertIn('412', data['paths']['/cacheable/{id}/']['put']['responses'])
 
+        self.assertEqual(
+            data['paths']['/testbinaryfiles/{id}/test_some_filefield_default/']['get']['responses']['200']['schema']['type'],
+            'file'
+        )
+        self.assertEqual(
+            data['paths']['/testbinaryfiles/{id}/test_some_filefield/']['get']['responses']['200']['schema']['type'],
+            'file'
+        )
+
     def test_manifest_json(self):
         result = self.get_result('get', '/manifest.json')
         self.assertEqual(result['name'], 'Example project')
@@ -4822,6 +4832,32 @@ def test_file_field(self):
         with open(os.path.join(DIR_PATH, 'cat.jpeg'), 'rb') as cat1:
             self.assertEqual(instance.some_filefield.file.read(), cat1.read())
 
+        self.get_result('get', ['testbinaryfiles', instance.id, 'test_some_filefield_default'])
+        self.get_result(
+            'get',
+            ['testbinaryfiles', instance.id, 'test_some_filefield_default'],
+            code=304,
+            headers={'If-Modified-Since': http_date((datetime.datetime.now() + datetime.timedelta(days=1)).timestamp())}
+        )
+        self.get_result(
+            'get',
+            ['testbinaryfiles', instance.id, 'test_some_filefield_default'],
+            headers={'If-Modified-Since': http_date((datetime.datetime.now() - datetime.timedelta(days=1)).timestamp())}
+        )
+
+        self.get_result('get', ['testbinaryfiles', instance.id, 'test_some_filefield'])
+        self.get_result(
+            'get',
+            ['testbinaryfiles', instance.id, 'test_some_filefield'],
+            code=304,
+            headers={'If-Modified-Since': http_date((datetime.datetime.now() + datetime.timedelta(days=1)).timestamp())}
+        )
+        self.get_result(
+            'get',
+            ['testbinaryfiles', instance.id, 'test_some_filefield'],
+            headers={'If-Modified-Since': http_date((datetime.datetime.now() - datetime.timedelta(days=1)).timestamp())}
+        )
+
     def test_related_list_field(self):
         with open(os.path.join(DIR_PATH, 'cat.jpeg'), 'rb') as fd:
             content = fd.read()
diff --git a/test_src/test_proj/views.py b/test_src/test_proj/views.py
index 2056fb44..d4ca94a8 100644
--- a/test_src/test_proj/views.py
+++ b/test_src/test_proj/views.py
@@ -1,3 +1,4 @@
+import mimetypes
 import time
 import json
 
@@ -9,7 +10,7 @@
 from vstutils.api.decorators import action, nested_view, subaction, extend_filterbackends
 from vstutils.api.serializers import DataSerializer, JsonObjectSerializer
 from vstutils.api.auth import UserViewSet
-from vstutils.api.actions import Action
+from vstutils.api.actions import Action, SimpleFileAction
 from vstutils.utils import create_view
 from vstutils.gui.context import gui_version
 
@@ -131,6 +132,27 @@ def test_err(self, request, *args, **kwargs):  # nocv
 
 
 class TestBinaryFilesViewSet(ModelWithBinaryFiles.generated_view):
+
+    @SimpleFileAction(as_attachment=True)
+    def test_some_filefield_default(self, request, *args, **kwargs):
+        return self.get_object().some_filefield
+
+    @SimpleFileAction(as_attachment=True)
+    def test_some_filefield(self, request, *args, **kwargs):
+        return self.get_object()
+
+    @test_some_filefield.modified_since
+    def test_some_filefield(self, obj):
+        return obj.some_filefield.storage.get_modified_time(obj.some_filefield.name)
+
+    @test_some_filefield.pre_data
+    def test_some_filefield(self, obj):
+        file = obj.some_filefield
+        filename = file.name
+        content_type, _ = mimetypes.guess_type(filename)
+        content_type = content_type or 'application/octet-stream'
+        return file, filename, content_type
+
     @action(methods=['get'], detail=True)
     def test_nested_view_inspection(self, *args, **kwargs):
         raise Exception  # nocv
diff --git a/vstutils/api/actions.py b/vstutils/api/actions.py
index 0f43e3a9..1507195c 100644
--- a/vstutils/api/actions.py
+++ b/vstutils/api/actions.py
@@ -1,10 +1,15 @@
+import mimetypes
+from contextlib import suppress
+
 from django.db import transaction
 from django.http.response import FileResponse
+from django.utils.http import http_date, parse_http_date_safe
 from rest_framework import serializers
 from rest_framework.decorators import action
 from rest_framework.utils.serializer_helpers import ReturnDict, ReturnList
 from drf_yasg.utils import swagger_auto_schema
 
+from .. import exceptions as vstexceptions
 from .responses import HTTP_200_OK, HTTP_201_CREATED, HTTP_204_NO_CONTENT
 from .serializers import EmptySerializer, DataSerializer
 from .pagination import SimpleCountedListPagination
@@ -411,3 +416,161 @@ def deleter(deleter_method):
         resulted_action.deleter = deleter
         resulted_action.__doc__ = self.extra_actions['get'].__doc__
         return resulted_action
+
+
+class SimpleFileAction(Action):
+    """
+    Action for handling file responses. This action always returns a FileResponse.
+
+    This class is designed to simplify the process of creating actions that return file responses.
+    It ensures that the file is only sent if it has been modified since the client's last request,
+    and it sets appropriate headers to facilitate caching and attachment handling.
+
+    Examples:
+
+       .. sourcecode:: python
+
+        from vstutils.api.base import ModelViewSet
+        from vstutils.api.actions import SimpleFileAction
+        ...
+
+        class AuthorViewSet(ModelViewSet):
+            model = ...
+            ...
+
+            @SimpleFileAction()
+            def download_resume(self, request, *args, **kwargs):
+                ''' Get resume file for the author. '''
+                instance = self.get_object()
+                return instance.resume_file
+
+       .. sourcecode:: python
+
+        from vstutils.api.base import ModelViewSet
+        from vstutils.api.actions import SimpleFileAction
+        ...
+
+        class AuthorViewSet(ModelViewSet):
+            model = ...
+            ...
+
+            @SimpleFileAction()
+            def download_archives(self, request, *args, **kwargs):
+                ''' Get archive of multiple files for the author. '''
+                instance = self.get_object()
+                return instance.multiple_files
+
+            @download_archives.modified_since
+            def modified_since(self, view, obj):
+                ''' Custom modified_since for multiple files. '''
+                modified_times = [file.storage.get_modified_time(file.name) for file in obj]
+                latest_modified_time = max(modified_times, default=datetime.datetime(1970, 1, 1))
+                return latest_modified_time
+
+            @download_archives.pre_data
+            def pre_data(self, view, obj):
+                ''' Custom pre_data for multiple files, creating a zip archive. '''
+                zip_buffer = BytesIO()
+                with zipfile.ZipFile(zip_buffer, 'w') as zip_file:
+                    for file in obj:
+                        zip_file.writestr(file.name, file.read())
+                zip_buffer.seek(0)
+                filename = 'archive.zip'
+                content_type = 'application/zip'
+                return zip_buffer, filename, content_type
+
+
+    :param cache_control: Cache-Control header value. Defaults to 'max-age=3600'.
+    :param as_attachment: Boolean indicating if the file should be sent as an attachment. Defaults to False.
+    :param kwargs: Additional named arguments for :func:`rest_framework.decorators.action`.
+    """
+    __slots__ = ('extra_actions', 'cache_control', 'as_attachment')
+
+    def __init__(self, cache_control='max-age=3600', as_attachment=False, *args, **kwargs):
+        kwargs.setdefault('methods', ['GET'])
+        kwargs['serializer_class'] = EmptySerializer
+        kwargs['result_serializer_class'] = FileResponse
+        super().__init__(*args, **kwargs)
+        self.extra_actions = {}
+        self.cache_control = cache_control
+        self.as_attachment = as_attachment
+
+    def modified_since(self, view, obj):
+        """
+        Default modified_since method that checks the modification time of a file.
+
+        :param view: The view instance.
+        :param obj: The file object, typically a FileField or ImageField.
+
+        :return: The modification time of the file, or None if it cannot be determined.
+        """
+        with suppress(AttributeError):
+            return obj.storage.get_modified_time(obj.name)
+
+    def pre_data(self, view, obj):
+        """
+        Default pre_data method that returns the file, its name, and content type.
+
+        :param view: The view instance.
+        :param obj: The file object, typically a FileField or ImageField.
+
+        :return: A tuple containing the file, its name, and its content type.
+        """
+        file = obj
+        filename = file.name
+        content_type, _ = mimetypes.guess_type(filename)
+        content_type = content_type or 'application/octet-stream'
+        return file, filename, content_type
+
+    def __call__(self, getter=None):
+        """
+        Main method for handling the action call.
+
+        :param getter: A function that retrieves the file object.
+
+        :return: The wrapped action method.
+        """
+        self.extra_actions['get'] = getter
+
+        def action_method(view, request, *args, **kwargs):
+            get_instance_method = self.extra_actions.get('get')
+            if not get_instance_method:
+                raise ValueError("Getter method must be defined.")  # nocv
+
+            instance = get_instance_method(view, request, *args, **kwargs)
+            modified = self.extra_actions.get('modified_since', self.modified_since)(view, instance)
+
+            if modified and (if_modified_since := request.headers.get('If-Modified-Since')):
+                if modified.timestamp() <= parse_http_date_safe(if_modified_since):
+                    raise vstexceptions.NotModifiedException()
+
+            file, filename, content_type = self.extra_actions.get('pre_data', self.pre_data)(view, instance)
+            response = FileResponse(
+                file,
+                as_attachment=self.as_attachment,
+                filename=filename,
+                content_type=content_type
+            )
+            if modified:
+                response['Last-Modified'] = http_date(modified.timestamp())
+            response['Cache-Control'] = self.cache_control
+            return response
+
+        action_method.__name__ = getter.__name__ if getter else self.action_kwargs['name']
+        action_method.__doc__ = self.extra_actions['get'].__doc__
+        resulted_action = super().__call__(action_method)
+
+        def modified_since_method(modified_since):
+            self.extra_actions['modified_since'] = modified_since
+            modified_since.__name__ = f'{action_method.__name__}__modified_since_method'
+            return self(self.extra_actions.get('get'))
+
+        def pre_data_method(pre_data):
+            self.extra_actions['pre_data'] = pre_data
+            pre_data.__name__ = f'{action_method.__name__}__pre_data_method'
+            return self(self.extra_actions.get('get'))
+
+        resulted_action.modified_since = modified_since_method
+        resulted_action.pre_data = pre_data_method
+        resulted_action.__doc__ = self.extra_actions['get'].__doc__
+        return resulted_action
diff --git a/vstutils/api/actions.pyi b/vstutils/api/actions.pyi
index 35d1e7cc..e937a5c7 100644
--- a/vstutils/api/actions.pyi
+++ b/vstutils/api/actions.pyi
@@ -1,7 +1,9 @@
 import typing as _t
+from datetime import datetime
 from .pagination import SimpleCountedListPagination as SimpleCountedListPagination
 from .responses import BaseResponseClass as BaseResponseClass, HTTP_200_OK as HTTP_200_OK, HTTP_201_CREATED as HTTP_201_CREATED, HTTP_204_NO_CONTENT as HTTP_204_NO_CONTENT
 from .serializers import DataSerializer as DataSerializer, EmptySerializer as EmptySerializer
+from django.http.request import HttpRequest
 from django.http.response import HttpResponseBase, FileResponse
 from rest_framework.request import Request
 from rest_framework.response import Response
@@ -14,6 +16,12 @@ class SimpleActionObject(_t.Protocol):
     def setter(self, func: _t.Callable) -> _t.Union[ViewSetAction, 'SimpleActionObject']: ...
     def deleter(self, func: _t.Callable) -> _t.Union[ViewSetAction, 'SimpleActionObject']: ...
 
+
+class SimpleFileActionObject(_t.Protocol):
+    def pre_data(self, func: _t.Callable) -> _t.Union[ViewSetAction, 'SimpleFileActionObject']: ...
+    def modified_since(self, func: _t.Callable) -> _t.Union[ViewSetAction, 'SimpleFileActionObject']: ...
+
+
 class DummyAtomic:
     def __init__(self, *args, **kwargs) -> None: ...
     def __enter__(self): ...
@@ -92,3 +100,42 @@ class SimpleAction(Action):
             return self(self.extra_actions.get('get'))
 
         return action_method
+
+
+class SimpleFileAction(Action):
+    as_attachment: bool
+    extra_actions: dict[_t.Literal['get', 'modified_since', 'pre_data'], _t.Callable]
+    cache_control: str
+
+    def __init__(
+        self,
+        cache_control: str = 'max-age=3600',
+        as_attachment: bool = False,
+        *args: _t.Any,
+        **kwargs: _t.Any
+    ) -> None: ...
+
+    def modified_since(
+        self,
+        obj: _t.Any
+    ) -> _t.Optional[datetime]: ...
+
+    def pre_data(
+        self,
+        obj: _t.Any
+    ) -> _t.Tuple[_t.Any, str, str]: ...
+
+    def __call__(  # type: ignore[override]
+        self,
+        getter: _t.Optional[_t.Callable[[viewsets.ViewSet, HttpRequest, _t.Any], _t.Any]] = None
+    ) -> _t.Union['ViewSetAction', 'SimpleFileActionObject']: ...
+
+    def modified_since_method(
+        self,
+        modified_since: _t.Callable[[HttpRequest, _t.Any], _t.Optional[datetime]]
+    ) -> _t.Union['ViewSetAction', 'SimpleFileActionObject']: ...
+
+    def pre_data_method(
+        self,
+        pre_data: _t.Callable[[_t.Any], _t.Tuple[_t.Any, str, str]]
+    ) -> _t.Union['ViewSetAction', 'SimpleFileActionObject']: ...
diff --git a/vstutils/api/base.py b/vstutils/api/base.py
index 65c97d76..74bf8559 100644
--- a/vstutils/api/base.py
+++ b/vstutils/api/base.py
@@ -28,6 +28,7 @@
 from rest_framework.utils.serializer_helpers import ReturnList, ReturnDict
 
 from ..utils import classproperty, get_if_lazy, raise_context_decorator_with_default, patch_gzip_response_decorator
+from .. import exceptions as vstexceptions
 from . import responses, fields
 from .filter_backends import get_serializer_readable_fields
 from .serializers import (
@@ -646,10 +647,8 @@ class attribute set to ``True``. This enables automatic caching capabilities for
     response times and reducing server load for frequently accessed resources.
     """
 
-    class NotModifiedException(exceptions.APIException):
-        status_code = 304
-        default_detail = ''
-        default_code = 'cached'
+    class NotModifiedException(vstexceptions.NotModifiedException):
+        pass
 
     class PreconditionFailedException(exceptions.APIException):
         status_code = 412
diff --git a/vstutils/api/schema/schema.py b/vstutils/api/schema/schema.py
index ec6aefc8..6ecc3ca3 100644
--- a/vstutils/api/schema/schema.py
+++ b/vstutils/api/schema/schema.py
@@ -140,9 +140,11 @@ def get_default_response_serializer(self):
         if self.view.action not in main_actions:
             with contextlib.suppress(AttributeError):
                 action = getattr(self.view, self.view.action).action
-                if action.result_serializer_class and \
-                        issubclass(action.result_serializer_class, serializers.BaseSerializer):
-                    result = action.result_serializer_class(many=action.is_list)
+                if action.result_serializer_class:
+                    if issubclass(action.result_serializer_class, serializers.BaseSerializer):
+                        result = action.result_serializer_class(many=action.is_list)
+                    elif issubclass(action.result_serializer_class, FileResponse):
+                        result = Schema(type='file')
         return result or super().get_default_response_serializer()
 
 
diff --git a/vstutils/exceptions.py b/vstutils/exceptions.py
index 465cd3d2..cb099648 100644
--- a/vstutils/exceptions.py
+++ b/vstutils/exceptions.py
@@ -1,5 +1,11 @@
 # pylint: disable=unused-import
-from rest_framework import status
+from rest_framework import status, exceptions
+
+
+class NotModifiedException(exceptions.APIException):
+    status_code = 304
+    default_detail = ''
+    default_code = 'cached'
 
 
 class VSTUtilsException(Exception):

From 9952bbeb8cf1c3274f7820849657c79ef1671487 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Fri, 24 May 2024 22:34:07 -0700
Subject: [PATCH 08/46] Update fastapi version

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index afee8e18..31622f95 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,7 +16,7 @@ uvicorn~=0.28.0
 pyuwsgi==2.0.23.post0
 # Restore it if some problems with pyuwsgi
 # uwsgi==2.0.23
-fastapi~=0.110.0
+fastapi-slim~=0.111.0
 aiofiles==23.2.1
 
 # Notifications

From 758e118841e453ba21605e771084aa891c33959a Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Fri, 31 May 2024 23:56:03 -0700
Subject: [PATCH 09/46] Fix(build): Exclude doc requirements from install
 requirements list.

---
 setup.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 86cd4f74..62c66d79 100644
--- a/setup.py
+++ b/setup.py
@@ -44,8 +44,7 @@
     install_requires=[
         "django~=" + (os.environ.get('DJANGO_DEP', "") or "5.0.3"),
     ]
-    + requirements
-    + load_requirements('requirements-doc.txt'),
+    + requirements,
     extras_require={
         'test': load_requirements('requirements-test.txt'),
         'rpc': requirements_rpc,

From e1e387727d7cea65f8f49018c884c472e70b8aeb Mon Sep 17 00:00:00 2001
From: Dmitriy Ovcharenko <ovcharenkodd@gmail.com>
Date: Mon, 3 Jun 2024 14:58:24 +1000
Subject: [PATCH 10/46] Feature: OAuth2

---
 .gitignore                                    |    2 +-
 .gitlab-ci.yml                                |   17 +-
 .npmignore                                    |    6 +
 doc/config.rst                                |   27 +
 frontend_src/.babelrc.js                      |   37 -
 frontend_src/.eslintrc.cjs                    |   44 +
 frontend_src/.eslintrc.js                     |   94 -
 frontend_src/.prettierrc                      |    1 -
 frontend_src/__mocks__/fileMock.js            |    1 -
 frontend_src/__mocks__/styleMock.js           |    1 -
 frontend_src/__tests__/startapp.test.js       |   13 -
 frontend_src/__tests__/startapp.test.ts       |   28 +
 frontend_src/app.common.js                    |   13 +-
 frontend_src/app_loader/OpenAPILoader.js      |   52 -
 frontend_src/app_loader/StaticFilesLoader.js  |  108 -
 frontend_src/app_loader/index.js              |  106 -
 frontend_src/auth-app.ts                      |   12 +
 frontend_src/index.ts                         |   17 +
 frontend_src/jest.config.js                   |   52 -
 frontend_src/libs/auto-complete.js            |  298 +
 frontend_src/libs/bootstrap-adminlte.js       |   24 +-
 frontend_src/libs/bootstrap-adminlte.scss     |   44 +-
 frontend_src/libs/fontawesome.scss            |    4 +-
 frontend_src/libs/jquery.js                   |    5 +-
 frontend_src/libs/vue.js                      |    5 +-
 frontend_src/shims.d.ts                       |    4 +-
 frontend_src/spa.ts                           |   12 -
 frontend_src/spa/index.html                   |   12 +
 frontend_src/spa/script.ts                    |    7 +
 frontend_src/spa/vite.config.ts               |   25 +
 frontend_src/splide.d.ts                      |    6 -
 frontend_src/tsconfig.json                    |   14 +-
 frontend_src/unittests/create-app.js          |   76 -
 frontend_src/unittests/create-app.ts          |  193 +
 frontend_src/unittests/index.ts               |   97 +-
 frontend_src/unittests/schema.ts              |    2 +-
 frontend_src/unittests/setup-jest.js          |   18 -
 frontend_src/unittests/setup.ts               |   35 +
 frontend_src/unittests/simple-schema.json     |    2 +-
 frontend_src/vite.config.ts                   |   51 +
 frontend_src/vstutils/AppConfiguration.ts     |  148 -
 frontend_src/vstutils/AppRoot.vue             |    5 +-
 .../vstutils/ComponentsRegistrator.js         |    5 +-
 frontend_src/vstutils/OpenAPILoader.ts        |   49 +
 .../AggregatedQueriesExecutor.test.js         |   10 +-
 .../vstutils/__tests__/actions.test.js        |   27 +-
 .../vstutils/__tests__/composables.test.js    |    3 +-
 .../__tests__/selected-filters.test.js        |   14 +-
 frontend_src/vstutils/api-fetch.ts            |   39 +
 frontend_src/vstutils/api/ApiConnector.ts     |   52 +-
 .../vstutils/api/TranslationsManager.ts       |   45 +-
 frontend_src/vstutils/app.ts                  |   76 +-
 frontend_src/vstutils/auth-app.ts             |   15 +
 .../__tests__/AutoUpdateController.test.js    |    7 +-
 .../cleanCacheHelpers.js                      |    0
 frontend_src/vstutils/components/Spinner.vue  |   76 +
 .../components/items/ControlSidebar.vue       |    9 +-
 .../vstutils/components/items/index.js        |    4 +-
 .../components/items/modal/HelpModal.vue      |    5 +-
 .../components/items/nav/TopNavigation.vue    |   25 +-
 .../components/items/sidebar/utils.ts         |    2 +-
 .../components/wysiwyg-editor/index.ts        |    4 +-
 .../components/BackButton.vue                 |   13 +
 .../default-auth-app/components/FormGroup.vue |   35 +
 .../default-auth-app/components/LangForm.vue  |   35 +
 .../default-auth-app/components/Layout.vue    |   34 +
 ...auth2ClientCredentialsGrantPageWrapper.vue |   84 +
 .../vstutils/default-auth-app/helpers.ts      |   55 +
 .../vstutils/default-auth-app/index.ts        |  121 +
 .../vstutils/default-auth-app/pages/Login.vue |  105 +
 .../default-auth-app/pages/PasswordReset.vue  |   75 +
 .../pages/PasswordResetConfirm.vue            |   87 +
 .../default-auth-app/pages/Registration.vue   |  122 +
 .../pages/RegistrationConfirmEmail.vue        |   45 +
 frontend_src/vstutils/default-page-loader.ts  |   42 +
 frontend_src/vstutils/fetch-values.ts         |    5 +-
 .../vstutils/fields/FieldsResolver.ts         |    2 +-
 .../fields/__tests__/FieldsResolver.test.js   |    1 -
 .../MultipleNamedBinFileField.test.js         |    1 -
 .../fields-container-classes.test.ts          |    1 -
 .../fields/__tests__/fields-types.test.ts     |    1 -
 .../fields/__tests__/nested-object.test.js    |    3 +-
 .../AutocompleteFieldContentEditMixin.vue     |    2 +-
 .../fields/autocomplete/composables.ts        |    3 +-
 .../vstutils/fields/barcode/QRCodeField.ts    |    2 +-
 .../barcode/__tests__/barcode-fields.test.ts  |   11 +-
 .../vstutils/fields/base/BaseField.ts         |  125 +-
 frontend_src/vstutils/fields/base/Field.ts    |  113 +
 .../boolean/__tests__/BooleanField.test.js    |    1 -
 .../__tests__/ordering-choices.test.ts        |    1 -
 .../datetime/__tests__/DateField.test.js      |    1 -
 .../datetime/__tests__/DateTimeField.test.js  |    6 +-
 .../__tests__/TimeIntervalField.test.js       |    1 -
 .../__tests__/DependFromFkField.test.js       |   17 +-
 .../dynamic/__tests__/DynamicField.test.js    |    1 -
 .../dynamic/__tests__/DynamicField.test.ts    |    3 +-
 .../__tests__/depend-on-parent-view.test.js   |   74 +-
 .../fields/files/__tests__/files.test.js      |    3 +-
 .../fields/files/__tests__/readfiles.test.js  |    3 +-
 .../files/__tests__/useDradAndDrop.test.js    |    7 +-
 .../BinaryFileFieldReadFileButton.js          |    2 +-
 .../binary-file/__tests__/binary-file.test.js |    5 +-
 .../files/csv-file/__tests__/csv-file.test.js |    3 +-
 .../vstutils/fields/files/csv-file/index.ts   |    4 +-
 .../multiple-named-binary-image/Carousel.vue  |   98 +-
 .../MultipleNamedBinaryImageFieldListView.vue |   18 +-
 .../__test__/NamedBinFile.test.js             |    1 -
 .../fields/fk/__tests__/DeepFKField.test.js   |    3 -
 .../fields/fk/__tests__/FKfield.test.js       |    5 +-
 .../vstutils/fields/fk/deep-fk/FkTree.vue     |    4 +-
 frontend_src/vstutils/fields/fk/fk/FKField.ts |    6 +-
 .../fk/__tests__/FKField-value-fetch.test.js  |    3 -
 .../not-available-fk-model-selected.test.js   |    1 -
 .../fields/json/__tests__/json.test.js        |    1 -
 .../vstutils/fields/nested-object/index.ts    |    2 +-
 .../fields/numbers/__tests__/integer.test.js  |    1 -
 .../fields/numbers/__tests__/number.test.js   |    1 -
 .../fields/numbers/__tests__/rating.test.js   |    1 -
 .../numbers/decimal/__tests__/decimal.test.js |    1 -
 .../vstutils/fields/numbers/number.js         |    2 +-
 .../vstutils/fields/related-list/index.ts     |    2 +-
 .../fields/text/__tests__/URIField.test.js    |    1 -
 .../fields/text/__tests__/masked.test.js      |    1 -
 .../fields/text/__tests__/phone-field.test.ts |    1 -
 .../text/__tests__/textparagraph.test.js      |    1 -
 frontend_src/vstutils/fields/text/masked.js   |    4 +-
 frontend_src/vstutils/fields/text/phone.js    |    2 +-
 frontend_src/vstutils/init-app.ts             |  313 +
 frontend_src/vstutils/models/Model.ts         |    2 +-
 .../vstutils/models/ModelsResolver.ts         |    4 +-
 .../vstutils/models/__tests__/Model.test.js   |    3 +-
 .../__tests__/additionalProperties.test.ts    |    8 +-
 .../data-based-fields-visibility.test.ts      |   15 +-
 .../vstutils/models/__tests__/errors.test.js  |    1 -
 .../__tests__/models-generation.test.ts       |    1 -
 .../readonly-fields-validation.test.ts        |    8 +-
 frontend_src/vstutils/models/sandbox.ts       |    6 +-
 .../page-loader/index.js}                     |   13 +-
 .../page-loader}/style.css                    |    0
 .../popUp/__tests__/ErrorHandler.test.js      |    5 +-
 .../__tests__/QuerySet-prefetch.test.js       |    3 -
 .../querySet/__tests__/QuerySet.test.js       |    3 -
 .../__tests__/QuerySetResolver.test.js        |    1 -
 .../vstutils/querySet/__tests__/bulk.test.js  |    3 -
 .../__tests__/entity-update-race.test.ts      |   17 +-
 .../querySet/__tests__/fetch-values.test.js   |   67 +-
 .../vstutils/router/RouterConstructor.ts      |    4 +-
 frontend_src/vstutils/schema.ts               |   79 +
 frontend_src/vstutils/signals.ts              |    8 +
 .../store/__tests__/actionViewStore.test.js   |   26 +-
 .../store/__tests__/custom-title.test.js      |   18 +-
 .../store/__tests__/deep-nested.test.js       |   17 +-
 .../store/__tests__/detailPage.test.js        |  227 +-
 .../store/__tests__/detailPageFilters.test.js |   37 +-
 .../vstutils/store/__tests__/helpers.test.js  |    1 -
 .../store/__tests__/localSettings.test.js     |    1 -
 .../vstutils/store/__tests__/modules.test.js  |    1 -
 .../vstutils/store/__tests__/page.test.js     |  142 +-
 .../prefetch-with-provided-instance.test.js   |   40 +-
 .../store/__tests__/useParentViews.test.js    |   12 +-
 frontend_src/vstutils/store/helpers.ts        |    8 +-
 frontend_src/vstutils/store/index.ts          |   15 +-
 .../vstutils/store/userSettingsStore.ts       |    2 +-
 frontend_src/vstutils/translation.ts          |   27 +-
 frontend_src/vstutils/users/index.js          |    2 +-
 .../vstutils/utils/__tests__/utils.test.js    |    9 +-
 frontend_src/vstutils/utils/index.ts          |   33 +-
 frontend_src/vstutils/utils/todo.js           |   49 -
 .../views/__tests__/ViewConstructor.test.js   |    1 -
 .../__tests__/actions-generation.test.js      |    1 -
 .../views/__tests__/file-responses.test.js    |   22 +-
 .../views/__tests__/hidden-views.test.js      |    3 +-
 .../__tests__/main-action-execution.test.ts   |   40 +-
 package.json                                  |  152 +-
 pyproject.toml                                |    3 +-
 requirements-prod.txt                         |    2 +-
 requirements.txt                              |    8 +-
 test_src/test_proj/__init__.py                |    4 +-
 test_src/test_proj/extra_claims_provider.py   |    2 +
 test_src/test_proj/settings.py                |   14 +-
 test_src/test_proj/test_settings.ini          |   18 +-
 test_src/test_proj/tests.py                   | 1597 +++--
 test_src/test_proj/views.py                   |   21 +-
 tox_build.ini                                 |    2 +-
 vstutils/__init__.py                          |    2 +-
 vstutils/api/__init__.py                      |   13 +-
 vstutils/api/auth.py                          |    4 +-
 vstutils/api/base.py                          |   10 +-
 vstutils/api/endpoint.py                      |   10 +-
 vstutils/api/password_reset.py                |  154 +
 vstutils/api/permissions.py                   |    5 +
 vstutils/api/registration/__init__.py         |    0
 vstutils/api/registration/serializers.py      |  137 +
 vstutils/api/registration/views.py            |   26 +
 vstutils/api/routers.py                       |    6 +
 vstutils/api/schema/generators.py             |   34 +-
 vstutils/api/schema/info.py                   |    3 -
 vstutils/api/schema/schema.py                 |    5 +-
 vstutils/asgi.py                              |   28 +-
 vstutils/exceptions.py                        |    7 +-
 vstutils/gui/context.py                       |   29 +-
 vstutils/gui/forms.py                         |  206 -
 vstutils/gui/views.py                         |   62 -
 vstutils/management/commands/web.py           |    1 +
 vstutils/middleware.py                        |   35 -
 vstutils/middleware.pyi                       |    6 -
 vstutils/oauth2/__init__.py                   |    0
 vstutils/oauth2/authentication.py             |   60 +
 vstutils/oauth2/authorization_code.py         |  129 +
 vstutils/oauth2/authorization_server.py       |  338 ++
 vstutils/oauth2/client.py                     |   74 +
 vstutils/oauth2/endpoints.py                  |  229 +
 vstutils/oauth2/jwk.py                        |   14 +
 vstutils/oauth2/requests.py                   |   41 +
 vstutils/oauth2/user.py                       |   32 +
 vstutils/settings.py                          |  272 +-
 vstutils/static_files.py                      |   68 -
 vstutils/templates/auth/base.html             |   68 -
 vstutils/templates/auth/login.html            |    1 -
 vstutils/templates/auth/tfa.html              |   33 -
 vstutils/templates/gui/base.html              |   33 -
 .../api_password_reset_email.html             |    5 +
 vstutils/templates/registration/base.html     |    2 -
 .../registration/base_agreements.html         |    2 +-
 .../registration/password_reset_complete.html |    6 -
 .../registration/password_reset_confirm.html  |   29 -
 .../registration/password_reset_done.html     |    6 -
 .../registration/password_reset_form.html     |   19 -
 .../registration/user_registration.html       |   49 -
 .../vst_inclusion_tags/bootstrap_form.html    |   22 -
 .../templates/widgets/agreement_widget.html   |   35 -
 vstutils/templatetags/translation.py          |   31 -
 vstutils/templatetags/vst_html_tags.py        |   47 +-
 vstutils/tests.py                             |   21 +-
 vstutils/translations/cn.py                   |   27 +-
 vstutils/translations/ru.py                   |   27 +-
 vstutils/translations/vi.py                   |   27 +-
 vstutils/urls.py                              |   44 +-
 vstutils/utils.py                             |   44 +-
 vstutils/utils.pyi                            |   14 +-
 webpack.config.js                             |  150 -
 yarn.lock                                     | 5267 +++++------------
 242 files changed, 7635 insertions(+), 7135 deletions(-)
 create mode 100644 .npmignore
 delete mode 100644 frontend_src/.babelrc.js
 create mode 100644 frontend_src/.eslintrc.cjs
 delete mode 100644 frontend_src/.eslintrc.js
 delete mode 100644 frontend_src/__mocks__/fileMock.js
 delete mode 100644 frontend_src/__mocks__/styleMock.js
 delete mode 100644 frontend_src/__tests__/startapp.test.js
 create mode 100644 frontend_src/__tests__/startapp.test.ts
 delete mode 100644 frontend_src/app_loader/OpenAPILoader.js
 delete mode 100644 frontend_src/app_loader/StaticFilesLoader.js
 delete mode 100644 frontend_src/app_loader/index.js
 create mode 100644 frontend_src/auth-app.ts
 create mode 100644 frontend_src/index.ts
 delete mode 100644 frontend_src/jest.config.js
 create mode 100644 frontend_src/libs/auto-complete.js
 delete mode 100644 frontend_src/spa.ts
 create mode 100644 frontend_src/spa/index.html
 create mode 100644 frontend_src/spa/script.ts
 create mode 100644 frontend_src/spa/vite.config.ts
 delete mode 100644 frontend_src/splide.d.ts
 delete mode 100644 frontend_src/unittests/create-app.js
 create mode 100644 frontend_src/unittests/create-app.ts
 delete mode 100644 frontend_src/unittests/setup-jest.js
 create mode 100644 frontend_src/unittests/setup.ts
 create mode 100644 frontend_src/vite.config.ts
 delete mode 100644 frontend_src/vstutils/AppConfiguration.ts
 create mode 100644 frontend_src/vstutils/OpenAPILoader.ts
 create mode 100644 frontend_src/vstutils/api-fetch.ts
 create mode 100644 frontend_src/vstutils/auth-app.ts
 rename frontend_src/{app_loader => vstutils}/cleanCacheHelpers.js (100%)
 create mode 100644 frontend_src/vstutils/components/Spinner.vue
 create mode 100644 frontend_src/vstutils/default-auth-app/components/BackButton.vue
 create mode 100644 frontend_src/vstutils/default-auth-app/components/FormGroup.vue
 create mode 100644 frontend_src/vstutils/default-auth-app/components/LangForm.vue
 create mode 100644 frontend_src/vstutils/default-auth-app/components/Layout.vue
 create mode 100644 frontend_src/vstutils/default-auth-app/components/Oauth2ClientCredentialsGrantPageWrapper.vue
 create mode 100644 frontend_src/vstutils/default-auth-app/helpers.ts
 create mode 100644 frontend_src/vstutils/default-auth-app/index.ts
 create mode 100644 frontend_src/vstutils/default-auth-app/pages/Login.vue
 create mode 100644 frontend_src/vstutils/default-auth-app/pages/PasswordReset.vue
 create mode 100644 frontend_src/vstutils/default-auth-app/pages/PasswordResetConfirm.vue
 create mode 100644 frontend_src/vstutils/default-auth-app/pages/Registration.vue
 create mode 100644 frontend_src/vstutils/default-auth-app/pages/RegistrationConfirmEmail.vue
 create mode 100644 frontend_src/vstutils/default-page-loader.ts
 create mode 100644 frontend_src/vstutils/fields/base/Field.ts
 create mode 100644 frontend_src/vstutils/init-app.ts
 rename frontend_src/{app_loader/LoadingPageController.js => vstutils/page-loader/index.js} (97%)
 rename frontend_src/{app_loader => vstutils/page-loader}/style.css (100%)
 create mode 100644 frontend_src/vstutils/schema.ts
 create mode 100644 test_src/test_proj/extra_claims_provider.py
 create mode 100644 vstutils/api/password_reset.py
 create mode 100644 vstutils/api/registration/__init__.py
 create mode 100644 vstutils/api/registration/serializers.py
 create mode 100644 vstutils/api/registration/views.py
 delete mode 100644 vstutils/gui/forms.py
 create mode 100644 vstutils/oauth2/__init__.py
 create mode 100644 vstutils/oauth2/authentication.py
 create mode 100644 vstutils/oauth2/authorization_code.py
 create mode 100644 vstutils/oauth2/authorization_server.py
 create mode 100644 vstutils/oauth2/client.py
 create mode 100644 vstutils/oauth2/endpoints.py
 create mode 100644 vstutils/oauth2/jwk.py
 create mode 100644 vstutils/oauth2/requests.py
 create mode 100644 vstutils/oauth2/user.py
 delete mode 100644 vstutils/static_files.py
 delete mode 100755 vstutils/templates/auth/base.html
 delete mode 100644 vstutils/templates/auth/login.html
 delete mode 100644 vstutils/templates/auth/tfa.html
 create mode 100644 vstutils/templates/registration/api_password_reset_email.html
 delete mode 100644 vstutils/templates/registration/base.html
 delete mode 100644 vstutils/templates/registration/password_reset_complete.html
 delete mode 100644 vstutils/templates/registration/password_reset_confirm.html
 delete mode 100644 vstutils/templates/registration/password_reset_done.html
 delete mode 100644 vstutils/templates/registration/password_reset_form.html
 delete mode 100644 vstutils/templates/registration/user_registration.html
 delete mode 100644 vstutils/templates/vst_inclusion_tags/bootstrap_form.html
 delete mode 100644 vstutils/templates/widgets/agreement_widget.html
 delete mode 100644 webpack.config.js

diff --git a/.gitignore b/.gitignore
index 108141c2..0df54e43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 node_modules
-vstutils/static/bundle
+vstutils/static/spa
 *.pyc
 *.c
 *.so
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d56d91ae..9cc94192 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,28 +126,32 @@ release:
   script:
     - bash autorelease.sh
 
-release_pypi:
+release_packages:
   stage: release
   image: registry.gitlab.com/vstconsulting/images:ubuntu-v3
   artifacts:
     reports:
       dotenv: variables.env
   rules:
-    - if: '$CI_COMMIT_TAG && $PYPI_UPLOAD_PASSWORD && $PYPI_UPLOAD_NAME'
+    - if: '$CI_COMMIT_TAG && $PYPI_UPLOAD_PASSWORD && $PYPI_UPLOAD_NAME && $NPM_TOKEN'
       when: on_success
     - when: never
   script:
+    - echo MILESTONE=${CI_COMMIT_TAG%.*} > variables.env
+    # pypi
     - tox -e build
     - twine upload -u ${PYPI_UPLOAD_NAME} -p ${PYPI_UPLOAD_PASSWORD} $(find dist/* -type f -name '*.tar.gz') $(find dist/* -type f -name '*.whl')
-    - echo MILESTONE=${CI_COMMIT_TAG%.*} > variables.env
+    # npm
+    - yarn build-lib
+    - echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}'>.npmrc
+    - npm publish --access public
   allow_failure: true
 
-
 release_job:
   stage: post_release
   image: registry.gitlab.com/gitlab-org/release-cli:latest
   needs:
-    - job: release_pypi
+    - job: release_packages
       artifacts: true
   rules:
     - if: '$CI_COMMIT_TAG && $PYPI_UPLOAD_PASSWORD && $PYPI_UPLOAD_NAME'
@@ -167,3 +171,6 @@ release_job:
         - name: 'PyPI'
           url: "https://pypi.org/project/vstutils/${CI_COMMIT_TAG}/"
           link_type: 'other'
+        - name: 'npm'
+          url: "https://www.npmjs.com/package/@vstconsulting/vstutils/v/${CI_COMMIT_TAG}"
+          link_type: 'other'
diff --git a/.npmignore b/.npmignore
new file mode 100644
index 00000000..8c2cc9c3
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,6 @@
+# Ignore all files
+*
+
+# Include the content of the dist directory
+!dist/
+!dist/**
diff --git a/doc/config.rst b/doc/config.rst
index 933b1af9..42acb751 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -592,6 +592,33 @@ For more detailed guidance on using and implementing web push notifications in V
 Remember, these settings are crucial for the proper functioning and reliability of web push notifications in your application. Ensure that they are configured accurately for optimal performance.
 
 
+OAuth 2 settings
+----------------
+
+Section ``[oauth]``.
+
+For custom OAuth2 server use the following settings:
+
+* **server_url**: URL of OAuth2 server.
+* **server_token_endpoint_path**: Path of OAuth2 server token endpoint (used in swagger schema). If not provided, `/{API_URL}/oauth2/token/` will be used instead.
+
+For custom OAuth2 server use the following settings:
+
+* **server_enable**: Enable or disable OAuth2 server. Default: `True`.
+* **server_issuer**: Issuer for JWT tokens. Must be provided.
+* **server_jwt_key**: JWT key. Octet sequence (used to represent symmetric keys). Must be provided.
+* **server_jwt_alg**: JWT algorithm. Default: `HS256`.
+* **server_class**: Import path to OAuth2 server class. See `authlib docs <https://docs.authlib.org/en/latest/specs/rfc6749.html#authlib.oauth2.rfc6749.AuthorizationServer>`_ for more information. Default: `vstutils.oauth2.authorization_server.AuthorizationServer`.
+* **server_enable_anon_login**: Enable or disable anonymous login using empty strings as username and password. Default: `False`.
+* **server_jwt_extra_claims_provider**: Import path to function that receives user and returns extra claims for JWT token. Default: `None`.
+* **server_allow_insecure**: If enabled then server will allow HTTP requests. Default: `False`.
+* **server_token_expires_in**: Token expiration time in seconds. Duration values can be used, for example `3d2h32m`. Default: `864000`.
+* **server_client_authentication_methods**: List of client authentication methods. Default server supports following values `'client_secret_basic', 'client_secret_post', 'none'`. Default: `['client_secret_basic', 'client_secret_post']`.
+* **server_authorization_endpoint**: Url of OAuth 2 Authorization endpoint. Will appear in output of `/.well-known/oauth-authorization-server` and `/.well-known/openid-configuration` discovery endpoints.
+
+By default one client can be configured using **server_simple_client_id** and **server_simple_client_secret**. Any other clients can be configured using **OAUTH_SERVER_CLIENTS** dictionary in `settings.py` where key is `client_id` and value is `client_secret`.
+
+
 Production web settings
 -----------------------
 
diff --git a/frontend_src/.babelrc.js b/frontend_src/.babelrc.js
deleted file mode 100644
index 83abeb9e..00000000
--- a/frontend_src/.babelrc.js
+++ /dev/null
@@ -1,37 +0,0 @@
-if (process.env.APP_ENV === 'prod') {
-    module.exports = {
-        presets: [
-            [
-                '@babel/preset-env',
-                {
-                    useBuiltIns: 'usage',
-                    corejs: { version: '3.31.1', proposals: true },
-                },
-            ],
-        ],
-        plugins: [
-            [
-                '@babel/plugin-transform-runtime',
-                {
-                    'corejs': false,
-                    'regenerator': false,
-                    'version': '^7.22.9'
-                }
-            ],
-        ],
-    }
-} else {
-    module.exports = {
-        presets: [
-            [
-                '@babel/preset-env',
-                {
-                    useBuiltIns: 'usage',
-                    corejs: { version: '3.31.1', proposals: true },
-                    targets: 'last 1 Chrome versions',
-                },
-            ],
-        ],
-    }
-}
-
diff --git a/frontend_src/.eslintrc.cjs b/frontend_src/.eslintrc.cjs
new file mode 100644
index 00000000..758e3ac4
--- /dev/null
+++ b/frontend_src/.eslintrc.cjs
@@ -0,0 +1,44 @@
+/* eslint-env node */
+require('@rushstack/eslint-patch/modern-module-resolution');
+
+module.exports = {
+    extends: [
+        'eslint:recommended',
+        'plugin:vue/vue3-essential',
+        '@vue/eslint-config-typescript',
+        'plugin:security/recommended',
+        'plugin:vitest-globals/recommended',
+        'plugin:prettier/recommended',
+    ],
+    parserOptions: {
+        ecmaVersion: 2022,
+    },
+    env: {
+        es2022: true,
+        node: true,
+    },
+    rules: {
+        '@typescript-eslint/no-unused-vars': ['error', { args: 'none' }],
+        'no-unused-vars': 'off',
+        'vue/multi-word-component-names': 'off',
+
+        // Vue 3
+        'vue/no-deprecated-destroyed-lifecycle': 'off',
+        'vue/no-deprecated-dollar-listeners-api': 'off',
+        'vue/no-deprecated-dollar-scopedslots-api': 'off',
+        'vue/no-deprecated-functional-template': 'off',
+        'vue/no-deprecated-v-on-native-modifier': 'off',
+        'vue/no-v-for-template-key-on-child': 'off',
+    },
+    overrides: [
+        {
+            files: ['**/__tests__/*.{j,t}s?(x)', '**/*.spec.{j,t}s?(x)', '**/*.test.{j,t}s?(x)'],
+            env: {
+                'vitest-globals/env': true,
+            },
+            globals: {
+                fetchMock: 'readonly',
+            },
+        },
+    ],
+};
diff --git a/frontend_src/.eslintrc.js b/frontend_src/.eslintrc.js
deleted file mode 100644
index 159f1479..00000000
--- a/frontend_src/.eslintrc.js
+++ /dev/null
@@ -1,94 +0,0 @@
-module.exports = {
-    root: true,
-    extends: [
-        'eslint:recommended',
-        'plugin:vue/recommended',
-        'plugin:prettier/recommended',
-        'plugin:security/recommended',
-    ],
-    parser: 'vue-eslint-parser',
-    parserOptions: {
-        parser: '@babel/eslint-parser',
-        sourceType: 'module',
-    },
-    env: {
-        browser: true,
-        commonjs: true,
-        es6: true,
-        node: true,
-        'vue/setup-compiler-macros': true,
-    },
-    rules: {
-        'no-debugger': 'error',
-        'prettier/prettier': 'error',
-        'vue/html-indent': ['error', 4],
-        'vue/html-self-closing': ['error', { html: { void: 'any' } }],
-        'vue/max-attributes-per-line': 'off',
-        'vue/multi-word-component-names': 'off',
-        'vue/no-boolean-default': ['warn', 'default-false'],
-        'vue/no-empty-component-block': 'error',
-        'vue/no-unsupported-features': ['error', { version: '^2.7.10' }],
-        'vue/no-useless-mustaches': 'error',
-        'vue/no-useless-v-bind': 'error',
-        'vue/one-component-per-file': 'off',
-        'vue/v-on-function-call': 'error',
-        '@typescript-eslint/consistent-type-imports': 'error',
-        'no-unused-vars': 'off',
-        '@typescript-eslint/no-unused-vars': ['error', { args: 'none' }],
-    },
-    globals: {
-        globalThis: 'readonly',
-        app: 'readonly',
-        Vue: 'readonly',
-        jest: 'readonly',
-    },
-    overrides: [
-        {
-            files: ['**/*.ts'],
-            parser: '@typescript-eslint/parser',
-            parserOptions: {
-                sourceType: 'module',
-                tsconfigRootDir: __dirname,
-                project: './tsconfig.json',
-                extraFileExtensions: ['.vue'],
-            },
-            extends: [
-                'eslint:recommended',
-                'plugin:@typescript-eslint/eslint-recommended',
-                'plugin:@typescript-eslint/recommended',
-                'plugin:@typescript-eslint/recommended-requiring-type-checking',
-                'plugin:@typescript-eslint/strict',
-                'plugin:prettier/recommended',
-            ],
-            rules: {
-                'no-unused-vars': 'off',
-                '@typescript-eslint/no-unused-vars': ['error', { args: 'none' }],
-            },
-        },
-        {
-            files: ['**/*.vue'],
-            parser: 'vue-eslint-parser',
-            parserOptions: {
-                parser: {
-                    '<template>': '@babel/eslint-parser',
-                    js: '@babel/eslint-parser',
-                    ts: '@typescript-eslint/parser',
-                },
-                // parser: '@typescript-eslint/parser',
-                // sourceType: 'module',
-                tsconfigRootDir: __dirname,
-                project: ['./tsconfig.json'],
-                extraFileExtensions: ['.vue'],
-            },
-            extends: [
-                'eslint:recommended',
-                'plugin:@typescript-eslint/eslint-recommended',
-                'plugin:@typescript-eslint/recommended',
-                'plugin:prettier/recommended',
-            ],
-            rules: {
-                '@typescript-eslint/no-unused-vars': ['error', { args: 'none' }],
-            },
-        },
-    ],
-};
diff --git a/frontend_src/.prettierrc b/frontend_src/.prettierrc
index 0eb166b5..00acae10 100644
--- a/frontend_src/.prettierrc
+++ b/frontend_src/.prettierrc
@@ -1,7 +1,6 @@
 {
     "arrowParens": "always",
     "bracketSpacing": true,
-    "htmlWhitespaceSensitivity": "ignore",
     "insertPragma": false,
     "bracketSameLine": false,
     "jsxSingleQuote": false,
diff --git a/frontend_src/__mocks__/fileMock.js b/frontend_src/__mocks__/fileMock.js
deleted file mode 100644
index 86059f36..00000000
--- a/frontend_src/__mocks__/fileMock.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = 'test-file-stub';
diff --git a/frontend_src/__mocks__/styleMock.js b/frontend_src/__mocks__/styleMock.js
deleted file mode 100644
index f053ebf7..00000000
--- a/frontend_src/__mocks__/styleMock.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = {};
diff --git a/frontend_src/__tests__/startapp.test.js b/frontend_src/__tests__/startapp.test.js
deleted file mode 100644
index 967cbf2b..00000000
--- a/frontend_src/__tests__/startapp.test.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { expect, test, describe } from '@jest/globals';
-import { createApp } from '../unittests/create-app.js';
-
-describe('App', () => {
-    test('Create and init', () => {
-        return createApp().then((app) => {
-            expect(app.user.username).toBe('testUser');
-        });
-
-        // FIXME render function is missing
-        // const wrapper = shallowMount(app.application);
-    });
-});
diff --git a/frontend_src/__tests__/startapp.test.ts b/frontend_src/__tests__/startapp.test.ts
new file mode 100644
index 00000000..3e0901c8
--- /dev/null
+++ b/frontend_src/__tests__/startapp.test.ts
@@ -0,0 +1,28 @@
+import { readFile } from 'node:fs/promises';
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { waitFor } from '@testing-library/dom';
+import { createApp, useTestCtx } from '@/unittests';
+
+describe('App', () => {
+    test('Create and init', async () => {
+        const app = await createApp();
+        const { screen } = useTestCtx();
+        expect(app.user._data.username).toBe('testUser');
+        await waitFor(() => screen.getByText('Homepage content'));
+    });
+
+    test('npm version matches pip version', async () => {
+        const root = join(dirname(fileURLToPath(import.meta.url)), '..', '..');
+
+        const [packageJsonContent, initPyContent] = await Promise.all([
+            readFile(join(root, 'package.json')),
+            readFile(join(root, 'vstutils', '__init__.py')),
+        ]);
+
+        const packageJsonVersion = JSON.parse(packageJsonContent.toString()).version;
+        const initPyVersion = /__version__: str = '(.+)'/.exec(initPyContent.toString())?.[1];
+
+        expect(packageJsonVersion).toBe(initPyVersion);
+    });
+});
diff --git a/frontend_src/app.common.js b/frontend_src/app.common.js
index 183efe6f..a155cb30 100644
--- a/frontend_src/app.common.js
+++ b/frontend_src/app.common.js
@@ -11,12 +11,15 @@ window.SELECT2_THEME = 'bootstrap-5';
 
 import 'jquery.scrollto';
 
-require('jquery-slimscroll');
+import 'jquery-slimscroll';
 
-require('jquery-touchswipe/jquery.touchSwipe.js');
+import 'jquery-touchswipe/jquery.touchSwipe.js';
 
 import './libs/vue.js';
 
+import { register } from 'swiper/element/bundle';
+register();
+
 import moment from 'moment-timezone';
 window.moment = moment;
 
@@ -35,7 +38,7 @@ import iziToast from 'izitoast';
 import 'izitoast/dist/css/iziToast.css';
 window.iziToast = iziToast;
 
-import autoComplete from 'JavaScript-autoComplete/auto-complete';
+import autoComplete from '@/libs/auto-complete.js';
 window.autoComplete = autoComplete;
 
 import './libs/bootstrap-adminlte.js';
@@ -64,7 +67,7 @@ import * as users from './vstutils/users';
 import './vstutils/local-settings';
 
 export * from './vstutils/ComponentsRegistrator.js';
-export * from './vstutils/AppConfiguration.ts';
+export * from './vstutils/schema';
 export * from '@/cache';
 export { i18n } from './vstutils/translation';
 
@@ -85,6 +88,8 @@ export {
     users,
 };
 
+export const getApp = utils.getApp;
+
 // vstutils styles
 import './gui.css';
 
diff --git a/frontend_src/app_loader/OpenAPILoader.js b/frontend_src/app_loader/OpenAPILoader.js
deleted file mode 100644
index 02d6d755..00000000
--- a/frontend_src/app_loader/OpenAPILoader.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Class, that is responsible for loading of OpenAPI schema.
- * Class has methods for loading of OpenAPI schema from API as well as from cache.
- */
-class OpenAPILoader {
-    /**
-     * Constructor of OpenApiLoader class.
-     * @param {object} cache Object, that methods for manipulating with indexedDB. Instance of FilesCache.
-     */
-    constructor(cache) {
-        /**
-         * Object, that methods for manipulating with indexedDB. Instance of FilesCache.
-         */
-        this.cache = cache;
-        this.cacheKey = 'openapi';
-    }
-
-    /**
-     * Method, that promises to load OpenApi schema from API.
-     * @return {Promise} Promise of loading of OpenApi schema from API.
-     */
-    loadSchemaFromApi() {
-        return fetch(window.endpoint_url + '?format=openapi').then((res) => {
-            if (!res.ok) {
-                throw new Error('API request for loading of OpenAPI schema failed.');
-            }
-
-            return res.json();
-        });
-    }
-
-    /**
-     * Method, that promises to load OpenApi schema.
-     * @return {Promise<unknown>} Promise of OpenApi schema loading.
-     */
-    async loadSchema() {
-        const cached = await this.cache.getJson(this.cacheKey);
-        if (cached) {
-            return cached;
-        }
-        try {
-            const schema = await this.loadSchemaFromApi();
-            this.cache.set(this.cacheKey, JSON.stringify(schema));
-            return schema;
-        } catch (error) {
-            console.error('Some error occurred during attempt of getting of OpenAPI schema.');
-            throw error;
-        }
-    }
-}
-
-export default OpenAPILoader;
diff --git a/frontend_src/app_loader/StaticFilesLoader.js b/frontend_src/app_loader/StaticFilesLoader.js
deleted file mode 100644
index 1e6c58f2..00000000
--- a/frontend_src/app_loader/StaticFilesLoader.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Groups list of objects by given key value
- *
- * @param {Object[]} objects
- * @param {string} key
- */
-function groupBy(objects, key) {
-    return objects.reduce(function (rv, x) {
-        (rv[x[key]] = rv[x[key]] || []).push(x);
-        return rv;
-    }, {});
-}
-
-/**
- * @name FileCallback
- * @function
- * @param {string} path - Path of file.
- * @param {string} type - Type of file.
- */
-
-/**
- * Class that represents one file
- */
-class StaticFile {
-    constructor(path, type = 'js', fileLoadedCallback = undefined, fileAddedToPageCallback = undefined) {
-        this.path = path;
-        this.type = type;
-        this.fileLoadedCallback = fileLoadedCallback;
-        this.fileAddedToPageCallback = fileAddedToPageCallback;
-    }
-
-    startLoading() {
-        this.loaded = fetch(this.path)
-            .then((r) => r.text())
-            .then((content) => {
-                if (this.fileLoadedCallback) this.fileLoadedCallback(this.path, this.type);
-                return content;
-            });
-    }
-
-    startAddingToPageWhenLoaded() {
-        this.addedToPage = this.loaded.then((content) => {
-            this._addToPage(content);
-            if (this.fileAddedToPageCallback) this.fileAddedToPageCallback(this.path, this.type);
-        });
-    }
-
-    _addToPage(content) {
-        if (this.type === 'js') {
-            window.eval(content);
-        } else if (this.type === 'css') {
-            const style = document.createElement('style');
-            style.setAttribute('rel', 'stylesheet');
-            style.innerHTML = content;
-            style.dataset.url = this.path;
-            document.head.appendChild(style);
-        } else if (this.type === 'tpl') {
-            const div = document.createElement('div');
-            div.innerHTML = content;
-            document.body.appendChild(div);
-        }
-    }
-}
-
-class StaticFilesLoader {
-    /**
-     * @param {Object[]} files
-     * @param {number} files[].priority - File priority (file with lower priority will be added on page first).
-     * @param {string} files[].type - File type (tpl, css, js).
-     * @param {string} files[].name - File path.
-     * @param {FileCallback=} fileLoadedCallback - Hook that will be called when file is loaded.
-     * @param {FileCallback=} fileAddedToPageCallback - Hook that will be called when file is added to page.
-     */
-    constructor(files, fileLoadedCallback = undefined, fileAddedToPageCallback = undefined) {
-        /**
-         * @type {StaticFile[][]}
-         */
-        this.buckets = [];
-        if (files.length === 0) {
-            return;
-        }
-
-        const rawBuckets = Object.entries(groupBy(files, 'priority'))
-            .sort((a, b) => Number(a[0]) - Number(b[0]))
-            .map((entry) => entry[1]);
-
-        this.buckets = rawBuckets.map((rawBucket) =>
-            rawBucket.map(
-                (rawFile) =>
-                    new StaticFile(rawFile.name, rawFile.type, fileLoadedCallback, fileAddedToPageCallback),
-            ),
-        );
-    }
-
-    async loadAndAddToPageAllFiles() {
-        this.buckets.flat().forEach((file) => file.startLoading());
-
-        for (let bucket of this.buckets) {
-            bucket.forEach((file) => file.startAddingToPageWhenLoaded());
-
-            for (let file of bucket) {
-                await file.addedToPage;
-            }
-        }
-    }
-}
-
-export { StaticFilesLoader };
diff --git a/frontend_src/app_loader/index.js b/frontend_src/app_loader/index.js
deleted file mode 100644
index fdffb848..00000000
--- a/frontend_src/app_loader/index.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import { globalCache } from '@/cache';
-import LoadingPageController from './LoadingPageController.js';
-import { cleanAllCacheAndReloadPage, cleanOpenApiCacheAndReloadPage } from './cleanCacheHelpers.js';
-import { StaticFilesLoader } from './StaticFilesLoader.js';
-import OpenAPILoader from './OpenAPILoader.js';
-import { AppConfiguration } from '../vstutils/AppConfiguration.ts';
-
-window.cleanAllCacheAndReloadPage = cleanAllCacheAndReloadPage;
-window.cleanOpenApiCacheAndReloadPage = cleanOpenApiCacheAndReloadPage;
-
-// Registers Service Worker
-if (
-    'serviceWorker' in navigator &&
-    (!localStorage.gui_version || localStorage.gui_version !== window.gui_version)
-) {
-    navigator.serviceWorker
-        .register('/service-worker.js')
-        .then((registration) => registration.update())
-        .catch((error) => {
-            console.error('Service Worker registration failed with ' + error);
-        });
-}
-
-const pageController = new LoadingPageController(window.resourceList.length);
-
-/**
- * Function saves to the Local Storage values of global gui versions variables.
- */
-function updateGuiVersionsInLocalStorage() {
-    localStorage.gui_version = window.gui_version;
-    localStorage.gui_user_version = window.gui_user_version;
-}
-
-/**
- * Adds error handler, that should handle(catch) errors, occurred during app dependencies loading.
- * This handler is supposed to catch errors in static files, that will be appended to the page during app dependencies loading.
- * Errors like getting/setting value of/to the undefined variables/properties and so on.
- */
-
-const errorEventHandler = (event) => pageController.appendError(event.error);
-window.addEventListener('error', errorEventHandler);
-
-pageController.loadAndAppendDependencies();
-
-function checkCacheVersions() {
-    if (localStorage.gui_version !== undefined && localStorage.gui_version !== window.gui_version) {
-        updateGuiVersionsInLocalStorage();
-        pageController.showUpdatingAppVersionMessage();
-        return cleanAllCacheAndReloadPage();
-    }
-
-    if (
-        localStorage.gui_user_version !== undefined &&
-        localStorage.gui_user_version !== window.gui_user_version
-    ) {
-        updateGuiVersionsInLocalStorage();
-        pageController.showUpdatingAppVersionMessage();
-        return cleanOpenApiCacheAndReloadPage();
-    }
-
-    updateGuiVersionsInLocalStorage();
-}
-
-async function startApp(cache) {
-    checkCacheVersions();
-
-    window.schemaLoader = new OpenAPILoader(cache);
-    const openApiLoadPromise = window.schemaLoader.loadSchema();
-
-    const filesLoadPromise = new StaticFilesLoader(
-        window.resourceList,
-        (path, type) => pageController.fileLoadedCallback(path, type),
-        (path, type) => pageController.fileAddedToPageCallback(path, type),
-    ).loadAndAddToPageAllFiles();
-
-    const [openapi] = await Promise.all([openApiLoadPromise, filesLoadPromise]);
-
-    window.spa.signals.emit('openapi.loaded', openapi);
-
-    const appConfig = new AppConfiguration({ schema: openapi });
-
-    window.app = new window.App(appConfig, cache);
-
-    // Starts app loading (OpenAPI schema parsing, creating models, views and so on).
-    await window.app.start();
-    window.app.mount();
-
-    window.spa.signals.connect('app.version.updated', () => {
-        alert('Oops! It looks like version of current page has become outdated. Please, reload the page.');
-    });
-
-    window.addEventListener('storage', function (e) {
-        if (window.gui_version !== localStorage.getItem('gui_version')) {
-            window.spa.signals.emit('app.version.updated');
-        }
-    });
-
-    // Removes onLoadingErrorHandler,
-    // because App does not need it after successful app Loading.
-    window.removeEventListener('error', errorEventHandler);
-    pageController.hideLoaderBlock();
-}
-
-window.onload = () => {
-    startApp(globalCache);
-};
diff --git a/frontend_src/auth-app.ts b/frontend_src/auth-app.ts
new file mode 100644
index 00000000..24d3f775
--- /dev/null
+++ b/frontend_src/auth-app.ts
@@ -0,0 +1,12 @@
+export { createAuthAppFactory, type AuthAppFactory } from './vstutils/auth-app';
+export { default as LangForm } from './vstutils/default-auth-app/components/LangForm.vue';
+export {
+    createTranslationsManager,
+    provideTranslationsManager,
+    useTranslationsManager,
+} from './vstutils/default-auth-app/helpers';
+export {
+    createBaseAuthApp,
+    createDefaultAuthApp,
+    customizeDefaultAuthAppCreator,
+} from './vstutils/default-auth-app/index';
diff --git a/frontend_src/index.ts b/frontend_src/index.ts
new file mode 100644
index 00000000..67cd43bb
--- /dev/null
+++ b/frontend_src/index.ts
@@ -0,0 +1,17 @@
+import * as spa from './app.common.js';
+export { spa };
+globalThis.spa = spa;
+
+export { initApp, type InitAppConfig, type LogoutHandler } from './vstutils/init-app';
+export { type AuthAppFactory } from './vstutils/auth-app';
+export { getApp } from './vstutils/utils';
+export {
+    onAppAfterInit,
+    onAppBeforeInit,
+    onFilterOperations,
+    onRoutesCreated,
+    onSchemaLoaded,
+    onSchemaModelsCreated,
+    onSchemaViewsCreated,
+} from './vstutils/signals';
+export { type AppSchema } from './vstutils/schema';
diff --git a/frontend_src/jest.config.js b/frontend_src/jest.config.js
deleted file mode 100644
index f8b42b6f..00000000
--- a/frontend_src/jest.config.js
+++ /dev/null
@@ -1,52 +0,0 @@
-const { defaults } = require('jest-config');
-const { pathsToModuleNameMapper } = require('ts-jest');
-const tsconfig = require('./tsconfig.json');
-
-module.exports = {
-    // Stop running tests after `n` failures
-    // bail: 1,
-
-    // The directory where Jest should output its coverage files
-    coverageDirectory: 'coverage',
-
-    // Indicates which provider should be used to instrument code for coverage
-    coverageProvider: 'v8',
-
-    // Indicates whether the coverage information should be collected while executing the test
-    collectCoverage: true,
-
-    // An array of glob patterns indicating a set of files for which coverage information should be collected
-    collectCoverageFrom: ['**/vstutils/**/*.{js,ts}'],
-
-    // A list of reporter names that Jest uses when writing coverage reports
-    coverageReporters: ['text', 'text-summary'],
-
-    // An array of file extensions your modules use
-    moduleFileExtensions: [...defaults.moduleFileExtensions, 'vue'],
-
-    moduleNameMapper: {
-        '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
-            '<rootDir>/__mocks__/fileMock.js',
-        '\\.(css|scss)$': '<rootDir>/__mocks__/styleMock.js',
-
-        '^(admin-lte|bootstrap).*(\\.js)?': '<rootDir>/__mocks__/fileMock.js',
-        '^(admin-lte|bootstrap).*(\\.(js|scss))?': '<rootDir>/__mocks__/styleMock.js',
-        '^(@splidejs/vue-splide).*': '<rootDir>/__mocks__/fileMock.js',
-
-        ...pathsToModuleNameMapper(tsconfig.compilerOptions.paths, { prefix: '<rootDir>/' }),
-    },
-
-    // A list of paths to directories that Jest should use to search for files in
-    // roots: ['<rootDir>'],
-
-    setupFiles: ['<rootDir>/unittests/setup-jest.js'],
-
-    // The test environment that will be used for testing
-    testEnvironment: 'jsdom',
-
-    // A map from regular expressions to paths to transformers
-    transform: {
-        '.*\\.vue$': '@vue/vue2-jest',
-        '^.+\\.m?[tj]sx?$': ['ts-jest/legacy', { useESM: true, isolatedModules: true }],
-    },
-};
diff --git a/frontend_src/libs/auto-complete.js b/frontend_src/libs/auto-complete.js
new file mode 100644
index 00000000..96d63e8b
--- /dev/null
+++ b/frontend_src/libs/auto-complete.js
@@ -0,0 +1,298 @@
+/* eslint-disable */
+
+/*
+    JavaScript autoComplete v1.0.4
+    Copyright (c) 2014 Simon Steinberger / Pixabay
+    GitHub: https://github.com/Pixabay/JavaScript-autoComplete
+    License: http://www.opensource.org/licenses/mit-license.php
+*/
+
+var autoComplete = (function () {
+    // "use strict";
+    function autoComplete(options) {
+        if (!document.querySelector) return;
+
+        // helpers
+        function hasClass(el, className) {
+            return el.classList
+                ? el.classList.contains(className)
+                : new RegExp('\\b' + className + '\\b').test(el.className);
+        }
+
+        function addEvent(el, type, handler) {
+            if (el.attachEvent) el.attachEvent('on' + type, handler);
+            else el.addEventListener(type, handler);
+        }
+        function removeEvent(el, type, handler) {
+            // if (el.removeEventListener) not working in IE11
+            if (el.detachEvent) el.detachEvent('on' + type, handler);
+            else el.removeEventListener(type, handler);
+        }
+        function live(elClass, event, cb, context) {
+            addEvent(context || document, event, function (e) {
+                var found,
+                    el = e.target || e.srcElement;
+                while (el && !(found = hasClass(el, elClass))) el = el.parentElement;
+                if (found) cb.call(el, e);
+            });
+        }
+
+        var o = {
+            selector: 0,
+            source: 0,
+            minChars: 3,
+            delay: 150,
+            offsetLeft: 0,
+            offsetTop: 1,
+            cache: 1,
+            menuClass: '',
+            renderItem: function (item, search) {
+                // escape special characters
+                search = search.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+                var re = new RegExp('(' + search.split(' ').join('|') + ')', 'gi');
+                return (
+                    '<div class="autocomplete-suggestion" data-val="' +
+                    item +
+                    '">' +
+                    item.replace(re, '<b>$1</b>') +
+                    '</div>'
+                );
+            },
+            onSelect: function (e, term, item) {},
+        };
+        for (var k in options) {
+            if (options.hasOwnProperty(k)) o[k] = options[k];
+        }
+
+        // init
+        var elems = typeof o.selector == 'object' ? [o.selector] : document.querySelectorAll(o.selector);
+        for (var i = 0; i < elems.length; i++) {
+            var that = elems[i];
+
+            // create suggestions container "sc"
+            that.sc = document.createElement('div');
+            that.sc.className = 'autocomplete-suggestions ' + o.menuClass;
+
+            that.autocompleteAttr = that.getAttribute('autocomplete');
+            that.setAttribute('autocomplete', 'off');
+            that.cache = {};
+            that.last_val = '';
+
+            that.updateSC = function (resize, next) {
+                var rect = that.getBoundingClientRect();
+                that.sc.style.left =
+                    Math.round(
+                        rect.left +
+                            (window.pageXOffset || document.documentElement.scrollLeft) +
+                            o.offsetLeft,
+                    ) + 'px';
+                that.sc.style.top =
+                    Math.round(
+                        rect.bottom +
+                            (window.pageYOffset || document.documentElement.scrollTop) +
+                            o.offsetTop,
+                    ) + 'px';
+                that.sc.style.width = Math.round(rect.right - rect.left) + 'px'; // outerWidth
+                if (!resize) {
+                    that.sc.style.display = 'block';
+                    if (!that.sc.maxHeight) {
+                        that.sc.maxHeight = parseInt(
+                            (window.getComputedStyle ? getComputedStyle(that.sc, null) : that.sc.currentStyle)
+                                .maxHeight,
+                        );
+                    }
+                    if (!that.sc.suggestionHeight)
+                        that.sc.suggestionHeight =
+                            that.sc.querySelector('.autocomplete-suggestion').offsetHeight;
+                    if (that.sc.suggestionHeight)
+                        if (!next) that.sc.scrollTop = 0;
+                        else {
+                            var scrTop = that.sc.scrollTop,
+                                selTop =
+                                    next.getBoundingClientRect().top - that.sc.getBoundingClientRect().top;
+                            if (selTop + that.sc.suggestionHeight - that.sc.maxHeight > 0)
+                                that.sc.scrollTop =
+                                    selTop + that.sc.suggestionHeight + scrTop - that.sc.maxHeight;
+                            else if (selTop < 0) that.sc.scrollTop = selTop + scrTop;
+                        }
+                }
+            };
+            addEvent(window, 'resize', that.updateSC);
+            document.body.appendChild(that.sc);
+
+            live(
+                'autocomplete-suggestion',
+                'mouseleave',
+                function (e) {
+                    var sel = that.sc.querySelector('.autocomplete-suggestion.selected');
+                    if (sel)
+                        setTimeout(function () {
+                            sel.className = sel.className.replace('selected', '');
+                        }, 20);
+                },
+                that.sc,
+            );
+
+            live(
+                'autocomplete-suggestion',
+                'mouseover',
+                function (e) {
+                    var sel = that.sc.querySelector('.autocomplete-suggestion.selected');
+                    if (sel) sel.className = sel.className.replace('selected', '');
+                    this.className += ' selected';
+                },
+                that.sc,
+            );
+
+            live(
+                'autocomplete-suggestion',
+                'mousedown',
+                function (e) {
+                    if (hasClass(this, 'autocomplete-suggestion')) {
+                        // else outside click
+                        var v = this.getAttribute('data-val');
+                        that.value = v;
+                        o.onSelect(e, v, this);
+                        that.sc.style.display = 'none';
+                    }
+                },
+                that.sc,
+            );
+
+            that.blurHandler = function () {
+                try {
+                    var over_sb = document.querySelector('.autocomplete-suggestions:hover');
+                } catch (e) {
+                    var over_sb = 0;
+                }
+                if (!over_sb) {
+                    that.last_val = that.value;
+                    that.sc.style.display = 'none';
+                    setTimeout(function () {
+                        that.sc.style.display = 'none';
+                    }, 350); // hide suggestions on fast input
+                } else if (that !== document.activeElement)
+                    setTimeout(function () {
+                        that.focus();
+                    }, 20);
+            };
+            addEvent(that, 'blur', that.blurHandler);
+
+            var suggest = function (data) {
+                var val = that.value;
+                that.cache[val] = data;
+                if (data.length && val.length >= o.minChars) {
+                    var s = '';
+                    for (var i = 0; i < data.length; i++) s += o.renderItem(data[i], val);
+                    that.sc.innerHTML = s;
+                    that.updateSC(0);
+                } else that.sc.style.display = 'none';
+            };
+
+            that.keydownHandler = function (e) {
+                var key = window.event ? e.keyCode : e.which;
+                // down (40), up (38)
+                if ((key == 40 || key == 38) && that.sc.innerHTML) {
+                    var next,
+                        sel = that.sc.querySelector('.autocomplete-suggestion.selected');
+                    if (!sel) {
+                        next =
+                            key == 40
+                                ? that.sc.querySelector('.autocomplete-suggestion')
+                                : that.sc.childNodes[that.sc.childNodes.length - 1]; // first : last
+                        next.className += ' selected';
+                        that.value = next.getAttribute('data-val');
+                    } else {
+                        next = key == 40 ? sel.nextSibling : sel.previousSibling;
+                        if (next) {
+                            sel.className = sel.className.replace('selected', '');
+                            next.className += ' selected';
+                            that.value = next.getAttribute('data-val');
+                        } else {
+                            sel.className = sel.className.replace('selected', '');
+                            that.value = that.last_val;
+                            next = 0;
+                        }
+                    }
+                    that.updateSC(0, next);
+                    return false;
+                }
+                // esc
+                else if (key == 27) {
+                    that.value = that.last_val;
+                    that.sc.style.display = 'none';
+                }
+                // enter
+                else if (key == 13 || key == 9) {
+                    var sel = that.sc.querySelector('.autocomplete-suggestion.selected');
+                    if (sel && that.sc.style.display != 'none') {
+                        o.onSelect(e, sel.getAttribute('data-val'), sel);
+                        setTimeout(function () {
+                            that.sc.style.display = 'none';
+                        }, 20);
+                    }
+                }
+            };
+            addEvent(that, 'keydown', that.keydownHandler);
+
+            that.keyupHandler = function (e) {
+                var key = window.event ? e.keyCode : e.which;
+                if (!key || ((key < 35 || key > 40) && key != 13 && key != 27)) {
+                    var val = that.value;
+                    if (val.length >= o.minChars) {
+                        if (val != that.last_val) {
+                            that.last_val = val;
+                            clearTimeout(that.timer);
+                            if (o.cache) {
+                                if (val in that.cache) {
+                                    suggest(that.cache[val]);
+                                    return;
+                                }
+                                // no requests if previous suggestions were empty
+                                for (var i = 1; i < val.length - o.minChars; i++) {
+                                    var part = val.slice(0, val.length - i);
+                                    if (part in that.cache && !that.cache[part].length) {
+                                        suggest([]);
+                                        return;
+                                    }
+                                }
+                            }
+                            that.timer = setTimeout(function () {
+                                o.source(val, suggest);
+                            }, o.delay);
+                        }
+                    } else {
+                        that.last_val = val;
+                        that.sc.style.display = 'none';
+                    }
+                }
+            };
+            addEvent(that, 'keyup', that.keyupHandler);
+
+            that.focusHandler = function (e) {
+                that.last_val = '\n';
+                that.keyupHandler(e);
+            };
+            if (!o.minChars) addEvent(that, 'focus', that.focusHandler);
+        }
+
+        // public destroy method
+        this.destroy = function () {
+            for (var i = 0; i < elems.length; i++) {
+                var that = elems[i];
+                removeEvent(window, 'resize', that.updateSC);
+                removeEvent(that, 'blur', that.blurHandler);
+                removeEvent(that, 'focus', that.focusHandler);
+                removeEvent(that, 'keydown', that.keydownHandler);
+                removeEvent(that, 'keyup', that.keyupHandler);
+                if (that.autocompleteAttr) that.setAttribute('autocomplete', that.autocompleteAttr);
+                else that.removeAttribute('autocomplete');
+                document.body.removeChild(that.sc);
+                that = null;
+            }
+        };
+    }
+    return autoComplete;
+})();
+
+export default autoComplete;
diff --git a/frontend_src/libs/bootstrap-adminlte.js b/frontend_src/libs/bootstrap-adminlte.js
index 6c4e068c..c60d9401 100644
--- a/frontend_src/libs/bootstrap-adminlte.js
+++ b/frontend_src/libs/bootstrap-adminlte.js
@@ -1,17 +1,17 @@
-const bootstrap = require('bootstrap/dist/js/bootstrap.js');
+import bootstrap from 'bootstrap/dist/js/bootstrap.js';
 
-require('admin-lte/build/js/CardRefresh.js');
-require('admin-lte/build/js/CardWidget.js');
-require('admin-lte/build/js/Dropdown.js');
-require('admin-lte/build/js/Layout.js');
-require('admin-lte/build/js/PushMenu.js');
-require('admin-lte/build/js/SidebarSearch.js');
-require('admin-lte/build/js/NavbarSearch.js');
-require('admin-lte/build/js/Toasts.js');
-require('admin-lte/build/js/TodoList.js');
-require('admin-lte/build/js/Treeview.js');
+import 'admin-lte/build/js/CardRefresh.js';
+import 'admin-lte/build/js/CardWidget.js';
+import 'admin-lte/build/js/Dropdown.js';
+import 'admin-lte/build/js/Layout.js';
+import 'admin-lte/build/js/PushMenu.js';
+import 'admin-lte/build/js/SidebarSearch.js';
+import 'admin-lte/build/js/NavbarSearch.js';
+import 'admin-lte/build/js/Toasts.js';
+import 'admin-lte/build/js/TodoList.js';
+import 'admin-lte/build/js/Treeview.js';
 
-require('./bootstrap-adminlte.scss');
+import './bootstrap-adminlte.scss';
 
 window.bootstrap = bootstrap;
 
diff --git a/frontend_src/libs/bootstrap-adminlte.scss b/frontend_src/libs/bootstrap-adminlte.scss
index 367b3581..565c5460 100644
--- a/frontend_src/libs/bootstrap-adminlte.scss
+++ b/frontend_src/libs/bootstrap-adminlte.scss
@@ -1,33 +1,33 @@
 // Bootstrap
 // ---------------------------------------------------
-@import "~bootstrap/scss/functions";
-@import "~admin-lte/build/scss/bootstrap-variables";
+@import "bootstrap/scss/functions";
+@import "admin-lte/build/scss/bootstrap-variables";
 @import "../vstutils/variables-overrides";
-@import "~bootstrap/scss/bootstrap";
+@import "bootstrap/scss/bootstrap";
 
 // Variables and Mixins
 // ---------------------------------------------------
-@import "~admin-lte/build/scss/variables";
-@import "~admin-lte/build/scss/variables-alt";
-@import "~admin-lte/build/scss/mixins";
+@import "admin-lte/build/scss/variables";
+@import "admin-lte/build/scss/variables-alt";
+@import "admin-lte/build/scss/mixins";
 
-// @import "~admin-lte/build/scss/parts/core";
-@import "~admin-lte/build/scss/root";
-@import "~admin-lte/build/scss/animation-effects";
-@import "~admin-lte/build/scss/preloader";
-@import "~admin-lte/build/scss/layout";
-@import "~admin-lte/build/scss/main-header";
-@import "~admin-lte/build/scss/brand";
-@import "~admin-lte/build/scss/main-sidebar";
-@import "~admin-lte/build/scss/sidebar-mini";
-@import "~admin-lte/build/scss/dropdown";
-@import "~admin-lte/build/scss/navs";
-@import "~admin-lte/build/scss/pagination";
+// @import "admin-lte/build/scss/parts/core";
+@import "admin-lte/build/scss/root";
+@import "admin-lte/build/scss/animation-effects";
+@import "admin-lte/build/scss/preloader";
+@import "admin-lte/build/scss/layout";
+@import "admin-lte/build/scss/main-header";
+@import "admin-lte/build/scss/brand";
+@import "admin-lte/build/scss/main-sidebar";
+@import "admin-lte/build/scss/sidebar-mini";
+@import "admin-lte/build/scss/dropdown";
+@import "admin-lte/build/scss/navs";
+@import "admin-lte/build/scss/pagination";
 
-@import "~admin-lte/build/scss/parts/components";
-@import "~admin-lte/build/scss/parts/extra-components";
-@import "~admin-lte/build/scss/parts/pages";
-@import "~admin-lte/build/scss/parts/miscellaneous";
+@import "admin-lte/build/scss/parts/components";
+@import "admin-lte/build/scss/parts/extra-components";
+@import "admin-lte/build/scss/parts/pages";
+@import "admin-lte/build/scss/parts/miscellaneous";
 
 // Override color of main header border oin dark mode
 .dark-mode .main-header {
diff --git a/frontend_src/libs/fontawesome.scss b/frontend_src/libs/fontawesome.scss
index a292bd33..fef6f03a 100644
--- a/frontend_src/libs/fontawesome.scss
+++ b/frontend_src/libs/fontawesome.scss
@@ -1,5 +1,5 @@
-$fa-font-path: '~@fortawesome/fontawesome-free/webfonts';
-@import './node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss';
+$fa-font-path: '@fortawesome/fontawesome-free/webfonts';
+@import '@fortawesome/fontawesome-free/scss/fontawesome.scss';
 
 // ./node_modules/@fortawesome/fontawesome-free/scss/solid.scss without svg, ttf, eot
 @font-face {
diff --git a/frontend_src/libs/jquery.js b/frontend_src/libs/jquery.js
index 852250b2..071ed67c 100644
--- a/frontend_src/libs/jquery.js
+++ b/frontend_src/libs/jquery.js
@@ -1,6 +1,6 @@
 import jQuery from 'jquery';
+import select2 from 'select2';
 
-// For jest tests
 let $ = jQuery;
 if (typeof jQuery.default === 'function') {
     $ = jQuery.default;
@@ -9,9 +9,6 @@ if (typeof jQuery.default === 'function') {
 window.jQuery = $;
 window.$ = $;
 
-const select2 = require('select2');
-
-// For jest tests
 if (typeof $.prototype.select2 !== 'function') {
     select2($);
 }
diff --git a/frontend_src/libs/vue.js b/frontend_src/libs/vue.js
index f28cab4f..9bc911eb 100644
--- a/frontend_src/libs/vue.js
+++ b/frontend_src/libs/vue.js
@@ -1,7 +1,4 @@
 import Vue from 'vue';
-import * as Vue27 from 'vue';
-window.Vue = Vue;
-window.Vue27 = Vue27;
 
 import VueI18n from 'vue-i18n';
 window.VueI18n = VueI18n;
@@ -20,4 +17,6 @@ Vue.directive('element-bound', {
     },
 });
 
+Vue.config.productionTip = false;
+
 export { Vue, VueI18n, PortalVue };
diff --git a/frontend_src/shims.d.ts b/frontend_src/shims.d.ts
index 8a0e89d3..80424115 100644
--- a/frontend_src/shims.d.ts
+++ b/frontend_src/shims.d.ts
@@ -1,6 +1,7 @@
 import type { IApp } from './vstutils/app';
-import type SchemaLoader from './app_loader/OpenAPILoader.js';
+import type SchemaLoader from './vstutils/OpenAPILoader';
 import type * as SPA from './app.common.js';
+import 'vitest-fetch-mock';
 
 declare global {
     interface String {
@@ -18,7 +19,6 @@ declare global {
     var __currentApp: IApp | undefined;
     var SELECT2_THEME: string;
     var schemaLoader: SchemaLoader;
-    var cleanAllCacheAndReloadPage: () => void;
     var IS_TESTS: boolean | undefined;
     var DISABLE_AUTO_UPDATE: boolean | undefined;
     /* eslint-enable no-var */
diff --git a/frontend_src/spa.ts b/frontend_src/spa.ts
deleted file mode 100644
index 858df794..00000000
--- a/frontend_src/spa.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import * as utils from './vstutils/utils';
-export * from './app.common.js';
-import * as spa from './app.common.js';
-
-globalThis.spa = spa;
-
-const getApp = utils.getApp;
-export { getApp };
-
-import { App } from './vstutils/app';
-
-globalThis.App = App;
diff --git a/frontend_src/spa/index.html b/frontend_src/spa/index.html
new file mode 100644
index 00000000..12111a2d
--- /dev/null
+++ b/frontend_src/spa/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title></title>
+</head>
+<body>
+    <div id="app"></div>
+    <script type="module" src="./script.ts"></script>
+</body>
+</html>
diff --git a/frontend_src/spa/script.ts b/frontend_src/spa/script.ts
new file mode 100644
index 00000000..108d8253
--- /dev/null
+++ b/frontend_src/spa/script.ts
@@ -0,0 +1,7 @@
+import { initApp } from '../index';
+
+initApp({
+    api: {
+        url: new URL('/api/', window.location.origin).toString(),
+    },
+});
diff --git a/frontend_src/spa/vite.config.ts b/frontend_src/spa/vite.config.ts
new file mode 100644
index 00000000..248d26a3
--- /dev/null
+++ b/frontend_src/spa/vite.config.ts
@@ -0,0 +1,25 @@
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { type PluginOption, defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue2';
+import tsconfigPaths from 'vite-tsconfig-paths';
+
+const currentDir = dirname(fileURLToPath(import.meta.url));
+
+const frontendSrc = join(currentDir, '..');
+
+export default defineConfig(({ mode }) => {
+    const isDev = mode === 'development';
+
+    return {
+        root: currentDir,
+        base: '/spa/',
+        plugins: [tsconfigPaths({ root: frontendSrc }) as PluginOption, vue()],
+        build: {
+            sourcemap: isDev,
+            minify: !isDev,
+            outDir: join(frontendSrc, '..', 'vstutils', 'static', 'spa'),
+            emptyOutDir: true,
+        },
+    };
+});
diff --git a/frontend_src/splide.d.ts b/frontend_src/splide.d.ts
deleted file mode 100644
index 96a3d4a8..00000000
--- a/frontend_src/splide.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-declare module '@splidejs/vue-splide' {
-    const Splide: typeof Vue;
-    const SplideSlide: typeof Vue;
-
-    export { Splide, SplideSlide };
-}
diff --git a/frontend_src/tsconfig.json b/frontend_src/tsconfig.json
index 89c5da1b..bce6d64a 100644
--- a/frontend_src/tsconfig.json
+++ b/frontend_src/tsconfig.json
@@ -1,27 +1,29 @@
 {
     "include": [
-        "./**/*"
+        "./**/*",
     ],
     "compilerOptions": {
         "outDir": "./dist",
-        "baseUrl": "./",
         "allowJs": true,
         "target": "esnext",
+        "isolatedModules": true,
         "strict": true,
         "noImplicitAny": true,
         "noImplicitThis": true,
         "noImplicitReturns": true,
-        "module": "es2020",
-        "moduleResolution": "node",
+        "module": "es2022",
+        "moduleResolution": "Node",
         "esModuleInterop": true,
         "skipLibCheck": true,
         "resolveJsonModule": true,
         "types": [
+            "vite/client",
+            "vitest/globals",
             "jquery",
-            "bootstrap"
+            "bootstrap",
         ],
         "paths": {
-            "@/*": ["*"]
+            "@/*": ["./*"]
         }
     },
     "vueCompilerOptions": {
diff --git a/frontend_src/unittests/create-app.js b/frontend_src/unittests/create-app.js
deleted file mode 100644
index 8d2e1286..00000000
--- a/frontend_src/unittests/create-app.js
+++ /dev/null
@@ -1,76 +0,0 @@
-import 'core-js/actual/array/at';
-import { App } from '@/vstutils/app.ts';
-import { AppConfiguration } from '../vstutils/AppConfiguration.ts';
-import { DummyCache } from '@/cache';
-import { createLocalVue } from '@vue/test-utils';
-import VueI18n from 'vue-i18n';
-
-import testSchema from '../__mocks__/testSchema.json';
-import { openPage } from './open-page';
-
-export function createAppConfig({ schema = testSchema } = {}) {
-    return new AppConfiguration({
-        isDebug: true,
-        hostUrl: 'http://localhost',
-        endpointUrl: 'http://localhost/api/endpoint/',
-        isSuperuser: false,
-        isStaff: false,
-        schema,
-    });
-}
-
-/**
- *
- * @param {{schema: AppSchema}} options
- * @returns {Promise<App>}
- */
-export async function createApp({ schema = testSchema } = {}) {
-    const config = createAppConfig({ schema });
-    const cache = new DummyCache();
-    const vue = createLocalVue();
-    vue.use(VueI18n);
-    const app = new App(config, cache, vue);
-
-    const loadLanguages = app.translationsManager.loadLanguages;
-    app.translationsManager.loadLanguages = () =>
-        Promise.resolve([
-            { code: 'en', name: 'English' },
-            { code: 'ru', name: 'Russian' },
-        ]);
-
-    const loadTranslations = app.translationsManager.loadTranslations;
-    app.translationsManager.loadTranslations = () =>
-        Promise.resolve({ version: 'versions | version | versions' });
-
-    app.translationsManager.getTranslations = () =>
-        Promise.resolve({ version: 'versions | version | versions' });
-
-    const loadUser = app.api.loadUser;
-    app.api.loadUser = () =>
-        Promise.resolve({
-            email: 'admin@admin.admin',
-            first_name: '',
-            id: 1,
-            is_active: true,
-            is_staff: false,
-            last_name: '',
-            username: 'testUser',
-        });
-
-    const loadSettings = app.loadSettings;
-    app.loadSettings = () => Promise.resolve({});
-
-    const bulkQuery = app.api.bulkQuery;
-    app.api.bulkQuery = () => Promise.resolve({});
-
-    await app.start();
-    app.translationsManager.loadLanguages = loadLanguages;
-    app.translationsManager.loadTranslations = loadTranslations;
-    app.api.loadUser = loadUser;
-    app.loadSettings = loadSettings;
-    app.api.bulkQuery = bulkQuery;
-
-    await openPage('/');
-
-    return app;
-}
diff --git a/frontend_src/unittests/create-app.ts b/frontend_src/unittests/create-app.ts
new file mode 100644
index 00000000..264ffe7f
--- /dev/null
+++ b/frontend_src/unittests/create-app.ts
@@ -0,0 +1,193 @@
+import { User } from 'oidc-client-ts';
+import { createLocalVue } from '@vue/test-utils';
+import VueI18n from 'vue-i18n';
+import { DummyCache } from '@/cache';
+import { type AppSchema } from '@/vstutils/schema';
+import { type InitAppConfigRaw, _createUserManager } from '@/vstutils/init-app';
+import { getApp } from '@/vstutils/utils';
+import testSchema from '../__mocks__/testSchema.json';
+
+// Important to import from index to trigger side effects as if it was a real app
+import { initApp } from '@/index';
+
+export async function createApp(params?: { schema?: Partial<AppSchema>; disableBulk?: boolean }) {
+    // Remove old app
+    const previousApp = getApp();
+    if (previousApp) {
+        previousApp.rootVm.$destroy();
+        previousApp.rootVm.$el.remove();
+    }
+    window.location.href = '/';
+
+    // Prepare config
+
+    const vue = createLocalVue();
+    vue.config.productionTip = false;
+    vue.use(VueI18n);
+    const el = document.createElement('div');
+    document.body.appendChild(el);
+    const config: InitAppConfigRaw = {
+        el,
+        vue,
+        cache: new DummyCache(),
+        auth: { authorityUrl: 'https://auth.test', clientId: 'test-id', clientSecret: 'test-secret' },
+        api: { url: 'http://localhost/api/', disableBulk: true },
+    };
+    const schema = params?.schema ?? testSchema;
+
+    // Emulate previously authenticated user
+    const userManger = await _createUserManager(config, {
+        url: new URL('http://localhost/api/'),
+        endpointPath: '/endpoint/',
+        disableBulk: false,
+    });
+
+    // @ts-expect-error Skip some properties
+    const user = new User({
+        access_token: 'test-access_token',
+        refresh_token: 'test-refresh_token',
+        token_type: 'Bearer',
+    });
+    await userManger.storeUser(user);
+
+    // Start app
+
+    // eslint-disable-next-line @typescript-eslint/require-await
+    fetchMock.mockResponse(async (request) => {
+        const body = (request.body as Buffer | null)?.toString();
+
+        if (
+            request.url === 'https://auth.test/.well-known/openid-configuration' &&
+            request.method === 'GET'
+        ) {
+            return {
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({
+                    issuer: 'https://auth.test',
+                    response_types_supported: ['token'],
+                    grant_types_supported: ['password'],
+                    token_endpoint: 'https://auth.test/api/oauth2/token/',
+                    revocation_endpoint: 'https://auth.test/api/oauth2/revoke/',
+                    userinfo_endpoint: 'https://auth.test/api/oauth2/userinfo/',
+                }),
+            };
+        }
+
+        if (
+            request.url === 'https://auth.test/api/oauth2/userinfo/' &&
+            request.method === 'GET' &&
+            request.headers.get('Authorization') === 'Bearer test-access_token'
+        ) {
+            return {
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({
+                    sub: '1',
+                }),
+            };
+        }
+
+        if (
+            request.url === 'http://localhost/api/endpoint/?format=openapi' &&
+            request.method === 'GET' &&
+            request.headers.get('Authorization') === 'Bearer test-access_token'
+        ) {
+            return {
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(schema),
+            };
+        }
+
+        if (
+            request.url === 'http://localhost/api/v1/user/profile/_settings/' &&
+            request.method === 'GET' &&
+            request.headers.get('Authorization') === 'Bearer test-access_token'
+        ) {
+            return {
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({
+                    data: {
+                        main: {
+                            language: 'en',
+                            dark_mode: false,
+                        },
+                    },
+                }),
+            };
+        }
+
+        if (
+            request.method === 'PUT' &&
+            request.url === 'http://localhost/api/endpoint/' &&
+            body === '[{"method":"GET","path":["_lang"]}]'
+        ) {
+            return {
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify([
+                    {
+                        status: 200,
+                        data: {
+                            results: [
+                                { code: 'en', name: 'English' },
+                                { code: 'ru', name: 'Russian' },
+                            ],
+                        },
+                    },
+                ]),
+            };
+        }
+
+        if (
+            request.method === 'PUT' &&
+            request.url === 'http://localhost/api/endpoint/' &&
+            body === '[{"method":"GET","path":["_lang","en"]}]'
+        ) {
+            return {
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify([
+                    {
+                        status: 200,
+                        data: {
+                            translations: {
+                                version: 'versions | version | versions',
+                            },
+                        },
+                    },
+                ]),
+            };
+        }
+
+        if (
+            request.url === 'http://localhost/api/v1/user/profile/' &&
+            request.method === 'GET' &&
+            request.headers.get('Authorization') === 'Bearer test-access_token'
+        ) {
+            return {
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({
+                    email: 'admin@admin.admin',
+                    first_name: '',
+                    id: 1,
+                    is_active: true,
+                    is_staff: false,
+                    last_name: '',
+                    username: 'testUser',
+                }),
+            };
+        }
+
+        throw new Error(`Unexpected request: ${request.url}`);
+    });
+
+    await initApp(config);
+
+    fetchMock.resetMocks();
+
+    const app = getApp();
+
+    if (!params?.disableBulk) {
+        app.config.api.disableBulk = false;
+        app.api.disableBulk = false;
+    }
+
+    return app;
+}
diff --git a/frontend_src/unittests/index.ts b/frontend_src/unittests/index.ts
index c84be010..e64db930 100644
--- a/frontend_src/unittests/index.ts
+++ b/frontend_src/unittests/index.ts
@@ -1,5 +1,4 @@
-import { expect } from '@jest/globals';
-import { mount as vueMount } from '@vue/test-utils';
+import { mount as vueMount, createWrapper, type Wrapper } from '@vue/test-utils';
 import { waitFor as _waitFor, within } from '@testing-library/dom';
 import userEvent from '@testing-library/user-event';
 import { getApp } from '@/vstutils/utils';
@@ -21,49 +20,17 @@ export function mount(component: ComponentOptions<Vue>, options?: Parameters<typ
     });
 }
 
-let currentWrapper: ReturnType<typeof mount> | undefined;
-
-export async function mountApp() {
-    const app = globalThis.__currentApp;
-
-    if (!app) {
-        throw new Error('App is not initialized, use createApp() first');
-    }
-
-    if (currentWrapper) {
-        throw new Error('Mounting of multiple apps is not supported');
-    }
-
-    const wrapper = mount(
-        { mixins: [app.appRootComponent, ...app.additionalRootMixins] },
-        {
-            propsData: {
-                info: app.config.schema.info,
-                x_menu: app.config.schema.info['x-menu'],
-                x_docs: app.config.schema.info['x-docs'],
-            },
-        },
-    );
-
-    // @ts-expect-error Override rootVm
-    app.rootVm = wrapper.vm;
-
-    await waitForPageLoading();
-
-    currentWrapper = wrapper;
-
-    return wrapper;
-}
-
 export function useTestCtx() {
-    if (!currentWrapper) {
-        throw new Error('App must be mounted first');
+    if (!__currentApp) {
+        throw new Error('App is not created');
     }
-    const doc = currentWrapper.vm.$el.ownerDocument;
+    // @ts-expect-error __currentApp is set
+    const wrapper: Wrapper<Vue> = createWrapper(__currentApp._mounted);
+    const doc = wrapper.vm.$el.ownerDocument;
     const user = userEvent.setup({ document: doc });
     const screen = within(doc.body);
 
-    return { app: getApp(), screen, user, wrapper: currentWrapper, waitFor };
+    return { app: getApp(), screen, user, wrapper, waitFor };
 }
 
 export function waitFor<T>(callback: () => T, options?: Parameters<typeof _waitFor>[1]) {
@@ -81,3 +48,53 @@ export async function waitForPageLoading() {
     await waitFor(() => expect(isLoading()).toBeTruthy());
     await waitFor(() => expect(isLoading()).toBeFalsy());
 }
+
+export function expectRequest(
+    request: undefined | Request | [string | Request | undefined, RequestInit | undefined],
+    expected: { url?: string; method?: string; body: string | object; headers?: Record<string, string> },
+) {
+    if (!request) {
+        throw new Error('Request expected');
+    }
+    if (Array.isArray(request)) {
+        if (request[0] instanceof Request) {
+            request = request[0];
+        } else {
+            // @ts-expect-error It's actually a Request
+            request = new Request(request);
+        }
+    }
+    if (expected.url) {
+        expect(request.url).toBe(expected.url);
+    }
+    if (expected.method) {
+        expect(request.method).toBe(expected.method.toUpperCase());
+    }
+    if (expected.body) {
+        expect(request.body).toBeTruthy();
+        // @ts-expect-error It's actually a Buffer
+        const body = (request.body as Buffer).toString();
+        if (typeof expected.body === 'object') {
+            expect(JSON.parse(body)).toEqual(expected.body);
+        } else {
+            expect(body).toBe(expected.body);
+        }
+    }
+    if (expected.headers) {
+        const headers = request.headers;
+        for (const [key, value] of Object.entries(expected.headers)) {
+            expect(headers.get(key)).toBe(value);
+        }
+    }
+}
+
+export function expectNthRequest(
+    idx: number,
+    expected: { url?: string; method?: string; body: string | object; headers?: Record<string, string> },
+) {
+    expectRequest(fetchMockCallAt(idx), expected);
+}
+
+export function fetchMockCallAt(idx: number) {
+    return fetchMock.mock.calls.at(idx);
+}
diff --git a/frontend_src/unittests/schema.ts b/frontend_src/unittests/schema.ts
index bebfd147..60ad4a8b 100644
--- a/frontend_src/unittests/schema.ts
+++ b/frontend_src/unittests/schema.ts
@@ -1,4 +1,4 @@
-import type { AppSchema } from '@/vstutils/AppConfiguration';
+import type { AppSchema } from '@/vstutils/schema';
 import { mergeDeep } from '../vstutils/utils';
 import simpleSchema from './simple-schema.json';
 
diff --git a/frontend_src/unittests/setup-jest.js b/frontend_src/unittests/setup-jest.js
deleted file mode 100644
index 4ff6761e..00000000
--- a/frontend_src/unittests/setup-jest.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import $ from 'jquery';
-global.$ = global.jQuery = $;
-
-// Mock adminlte jquery functions
-$.fn.PushMenu = () => {};
-
-globalThis.IS_TESTS = true;
-globalThis.DISABLE_AUTO_UPDATE = globalThis.IS_TESTS;
-
-globalThis.OBJECT_URL = 'blob:http://test.vst/a757db77-eeca-4c26-b0f7-9bb2813c0577';
-
-if (typeof window.URL.createObjectURL === 'undefined') {
-    window.URL.createObjectURL = jest.fn(() => globalThis.OBJECT_URL);
-}
-
-if (typeof window.URL.revokeObjectURL === 'undefined') {
-    window.URL.revokeObjectURL = jest.fn();
-}
diff --git a/frontend_src/unittests/setup.ts b/frontend_src/unittests/setup.ts
new file mode 100644
index 00000000..94962713
--- /dev/null
+++ b/frontend_src/unittests/setup.ts
@@ -0,0 +1,35 @@
+import $ from 'jquery';
+import createFetchMock from 'vitest-fetch-mock';
+import { vi } from 'vitest';
+import QRCode from 'qrcode';
+
+// @ts-expect-error Mock canvas
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+QRCode.toCanvas = () => {};
+
+// @ts-expect-error Skip some properties
+global.$ = global.jQuery = $;
+
+// @ts-expect-error Mock adminlte jquery functions
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+$.fn.PushMenu = () => {};
+
+globalThis.IS_TESTS = true;
+globalThis.DISABLE_AUTO_UPDATE = globalThis.IS_TESTS;
+
+// @ts-expect-error Skip some properties
+globalThis.OBJECT_URL = 'blob:http://test.vst/a757db77-eeca-4c26-b0f7-9bb2813c0577';
+
+const fetchMocker = createFetchMock(vi);
+// sets globalThis.fetch and globalThis.fetchMock to our mocked version
+fetchMocker.enableMocks();
+
+if (typeof window.URL.createObjectURL === 'undefined') {
+    // @ts-expect-error Skip some properties
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    window.URL.createObjectURL = vi.fn(() => globalThis.OBJECT_URL);
+}
+
+if (typeof window.URL.revokeObjectURL === 'undefined') {
+    window.URL.revokeObjectURL = vi.fn();
+}
diff --git a/frontend_src/unittests/simple-schema.json b/frontend_src/unittests/simple-schema.json
index 1192a901..d98ede43 100644
--- a/frontend_src/unittests/simple-schema.json
+++ b/frontend_src/unittests/simple-schema.json
@@ -17,7 +17,7 @@
             "basic": []
         }
     ],
-    "host": "test.vst",
+    "host": "localhost",
     "info": {
         "title": "Test Project",
         "version": "v1",
diff --git a/frontend_src/vite.config.ts b/frontend_src/vite.config.ts
new file mode 100644
index 00000000..d555bca4
--- /dev/null
+++ b/frontend_src/vite.config.ts
@@ -0,0 +1,51 @@
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { type PluginOption, defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue2';
+import dts from 'vite-plugin-dts';
+import tsconfigPaths from 'vite-tsconfig-paths';
+
+const currentDir = dirname(fileURLToPath(import.meta.url));
+
+const frontendSrc = currentDir;
+
+export default defineConfig({
+    plugins: [
+        tsconfigPaths({ root: frontendSrc }) as PluginOption,
+        vue(),
+        dts({
+            insertTypesEntry: true,
+            exclude: ['**/__tests__', '**/*.test.ts', '**/dist', 'unittests', '**/vite.config.ts'],
+            tsconfigPath: join(frontendSrc, 'tsconfig.json'),
+        }),
+    ],
+    build: {
+        lib: {
+            entry: {
+                index: join(frontendSrc, 'index.ts'),
+                'auth-app': join(frontendSrc, 'auth-app.ts'),
+            },
+            formats: ['es'],
+        },
+        rollupOptions: {
+            external: ['vue'],
+        },
+    },
+    resolve: {
+        alias: {
+            'moment-timezone': 'moment-timezone/builds/moment-timezone-with-data-10-year-range.min.js',
+        },
+    },
+    test: {
+        globals: true,
+        setupFiles: [join(frontendSrc, 'unittests/setup.ts')],
+        environment: 'jsdom',
+        coverage: {
+            enabled: true,
+            include: ['frontend_src/**'],
+            provider: 'istanbul',
+            reporter: ['text', 'text-summary'],
+            reportsDirectory: join(frontendSrc, '..', 'node_modules', '.coverage'),
+        },
+    },
+});
diff --git a/frontend_src/vstutils/AppConfiguration.ts b/frontend_src/vstutils/AppConfiguration.ts
deleted file mode 100644
index cf9d0b25..00000000
--- a/frontend_src/vstutils/AppConfiguration.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import type * as swagger from 'swagger-schema-official';
-import type { FieldDefinition } from './fields/FieldsResolver';
-import { type HttpMethod } from './utils';
-
-declare global {
-    interface Window {
-        isDebug: boolean;
-        host_url: string;
-        endpoint_url: string;
-        project_gui_name: string;
-        project_version: string;
-        gui_version: string;
-        gui_user_version: string;
-        is_superuser: boolean;
-        is_staff: boolean;
-    }
-}
-
-export interface XMenuItem {
-    name: string;
-    span_class?: string | string[];
-    url?: string;
-    origin_link?: boolean;
-    sublinks?: XMenuItem[];
-}
-
-export type XMenu = XMenuItem[];
-
-export interface AppInfo extends swagger.Info {
-    'x-settings': {
-        static_path: string;
-        login_url: string;
-        logout_url: string;
-        [key: string]: any;
-    };
-    'x-docs': {
-        has_docs: boolean;
-        docs_url: string;
-    };
-    'x-page-limit': number;
-    'x-menu': XMenu;
-    'x-centrifugo-address'?: string;
-    'x-centrifugo-token'?: string;
-    'x-subscriptions-prefix': string;
-    'x-webpush'?: {
-        public_key: string;
-        user_settings_subpath: string | null;
-    };
-    [key: string]: any;
-}
-
-export const MODEL_MODES = ['DEFAULT', 'STEP'] as const;
-
-export type ModelDefinition = swagger.Schema & {
-    properties?: Record<string, FieldDefinition>;
-    'x-properties-groups'?: Record<string, string[]>;
-    'x-view-field-name'?: string;
-    'x-non-bulk-methods'?: HttpMethod[];
-    'x-translate-model'?: string;
-    'x-hide-not-required'?: boolean;
-    'x-display-mode'?: typeof MODEL_MODES[number];
-    'x-visibility-data-field-name'?: string;
-};
-
-export interface Operation extends swagger.Operation {
-    'x-hidden'?: boolean;
-}
-
-export type Path = swagger.Path & {
-    [key in HttpMethod]?: Operation | undefined;
-};
-
-export interface AppSchema extends swagger.Spec {
-    info: AppInfo;
-    definitions: Record<string, ModelDefinition>;
-    paths: Record<string, Path>;
-    [key: string]: any;
-}
-
-interface Params {
-    isDebug?: boolean;
-    hostUrl?: string;
-    endpointUrl?: string;
-    projectName?: string;
-    projectVersion?: string;
-    fullVersion?: string;
-    fullUserVersion?: string;
-    isSuperuser?: boolean;
-    isStaff?: boolean;
-    schema: AppSchema;
-    defaultPageLimit?: number;
-}
-
-export class AppConfiguration {
-    isDebug: boolean;
-    hostUrl: URL;
-    endpointUrl: URL;
-    projectName: string;
-    projectVersion: string;
-    fullVersion: string;
-    fullUserVersion: string;
-    isSuperuser: boolean;
-    isStaff: boolean;
-    schema: AppSchema;
-    defaultPageLimit: number;
-    staticPath: string;
-    urls: {
-        login: string;
-        logout: string;
-    };
-
-    constructor({
-        isDebug,
-        hostUrl,
-        endpointUrl,
-        projectName,
-        projectVersion,
-        fullVersion,
-        fullUserVersion,
-        isSuperuser,
-        isStaff,
-        schema,
-        defaultPageLimit,
-    }: Params) {
-        if (!schema) {
-            throw new TypeError('schema is required');
-        }
-        this.schema = schema;
-
-        this.isDebug = isDebug ?? window.isDebug;
-        this.hostUrl = new URL(hostUrl ?? window.host_url);
-        this.endpointUrl = new URL(endpointUrl ?? window.endpoint_url);
-        this.projectName = projectName ?? window.project_gui_name;
-        this.projectVersion = projectVersion ?? window.project_version;
-        this.fullVersion = fullVersion ?? window.gui_version;
-        this.fullUserVersion = fullUserVersion ?? window.gui_user_version;
-        this.isSuperuser = isSuperuser ?? window.is_superuser;
-        this.isStaff = isStaff ?? window.is_staff;
-        this.staticPath = schema.info['x-settings'].static_path;
-
-        this.urls = {
-            login: schema.info['x-settings'].login_url,
-            logout: schema.info['x-settings'].logout_url,
-        };
-
-        this.defaultPageLimit = defaultPageLimit ?? schema.info['x-page-limit'];
-    }
-}
diff --git a/frontend_src/vstutils/AppRoot.vue b/frontend_src/vstutils/AppRoot.vue
index 10dc37cd..5cbfd6f3 100644
--- a/frontend_src/vstutils/AppRoot.vue
+++ b/frontend_src/vstutils/AppRoot.vue
@@ -47,7 +47,7 @@
     import AppModals from './components/common/AppModals.vue';
 
     import type { Component, PropType } from 'vue';
-    import type { XMenu } from './AppConfiguration';
+    import type { XMenu } from './schema';
 
     const DARK_MODE_CLASS = 'dark-mode';
 
@@ -110,7 +110,7 @@
                 return menu;
             },
             showBackButton() {
-                return this.$route.name !== 'home' && this.$route.meta?.view.showBackButton;
+                return this.$route.name !== 'home' && this.$route.meta?.view?.showBackButton;
             },
             showTitle() {
                 return true;
@@ -223,3 +223,4 @@
         right: 0 !important;
     }
 </style>
+./schema
diff --git a/frontend_src/vstutils/ComponentsRegistrator.js b/frontend_src/vstutils/ComponentsRegistrator.js
index 216fcd98..b49c1389 100644
--- a/frontend_src/vstutils/ComponentsRegistrator.js
+++ b/frontend_src/vstutils/ComponentsRegistrator.js
@@ -24,10 +24,9 @@ class ComponentsRegistrator {
      */
     registerAll(vue) {
         for (let [name, component] of Object.entries(this.components)) {
-            if (vue.options.components[name]) {
-                throw new Error(`Component ${name} already registered`);
+            if (!vue.options.components[name]) {
+                vue.component(name, component);
             }
-            vue.component(name, component);
         }
     }
 }
diff --git a/frontend_src/vstutils/OpenAPILoader.ts b/frontend_src/vstutils/OpenAPILoader.ts
new file mode 100644
index 00000000..c6655499
--- /dev/null
+++ b/frontend_src/vstutils/OpenAPILoader.ts
@@ -0,0 +1,49 @@
+import { createApiFetch } from '@/vstutils/api-fetch';
+import { InitAppConfig } from './init-app';
+import { Cache } from '@/cache';
+import { type AppSchema } from './schema';
+
+/**
+ * Class, that is responsible for loading of OpenAPI schema.
+ * Class has methods for loading of OpenAPI schema from API as well as from cache.
+ */
+export default class OpenAPILoader {
+    config: InitAppConfig;
+    cacheKey: string;
+    cache: Cache;
+    anon: boolean;
+
+    constructor({ config, anon }: { config: InitAppConfig; anon?: boolean }) {
+        /**
+         * Object, that methods for manipulating with indexedDB. Instance of FilesCache.
+         */
+        this.cache = config.cache;
+        this.config = config;
+        this.anon = anon ?? false;
+        this.cacheKey = anon ? 'openapi-anon' : 'openapi';
+    }
+
+    async loadSchemaFromApi(): Promise<AppSchema> {
+        const apiFetch = this.anon ? fetch : createApiFetch({ config: this.config });
+        const res = await apiFetch(new URL('endpoint/?format=openapi', this.config.api.url));
+        if (!res.ok) {
+            throw new Error('API request for loading of OpenAPI schema failed.');
+        }
+        return res.json();
+    }
+
+    async loadSchema(): Promise<AppSchema> {
+        const cached = await this.cache.getJson(this.cacheKey);
+        if (cached) {
+            return cached as AppSchema;
+        }
+        try {
+            const schema = await this.loadSchemaFromApi();
+            this.cache.set(this.cacheKey, JSON.stringify(schema));
+            return schema;
+        } catch (error) {
+            console.error('Some error occurred during attempt of getting of OpenAPI schema.');
+            throw error;
+        }
+    }
+}
diff --git a/frontend_src/vstutils/__tests__/AggregatedQueriesExecutor.test.js b/frontend_src/vstutils/__tests__/AggregatedQueriesExecutor.test.js
index c03e88e6..71d77535 100644
--- a/frontend_src/vstutils/__tests__/AggregatedQueriesExecutor.test.js
+++ b/frontend_src/vstutils/__tests__/AggregatedQueriesExecutor.test.js
@@ -1,5 +1,4 @@
-import { expect, beforeEach, test, describe, beforeAll } from '@jest/globals';
-import fetchMock from 'jest-fetch-mock';
+import { createSchema, createApp } from '@/unittests';
 import { makeModel, BaseModel } from '../models';
 import { QuerySet } from '../querySet/QuerySet.ts';
 import { StringField } from '../fields/text/';
@@ -7,13 +6,10 @@ import { IntegerField } from '../fields/numbers/integer.js';
 import { RequestTypes } from '../utils';
 import { AggregatedQueriesExecutor } from '../AggregatedQueriesExecutor.js';
 import { NotFoundError } from '../querySet/errors.js';
-import { apiConnector } from '../api/ApiConnector';
-import { createAppConfig } from '../../unittests/create-app';
 
 describe('AggregatedQueriesExecutor', () => {
-    beforeAll(() => {
-        apiConnector.initConfiguration(createAppConfig());
-        fetchMock.enableMocks();
+    beforeAll(async () => {
+        await createApp({ schema: createSchema() });
     });
 
     beforeEach(() => {
diff --git a/frontend_src/vstutils/__tests__/actions.test.js b/frontend_src/vstutils/__tests__/actions.test.js
index 7410bd2f..f6db2639 100644
--- a/frontend_src/vstutils/__tests__/actions.test.js
+++ b/frontend_src/vstutils/__tests__/actions.test.js
@@ -1,6 +1,4 @@
-import { test, describe, beforeAll, expect, jest, beforeEach } from '@jest/globals';
-import fetchMock from 'jest-fetch-mock';
-import { createApp } from '../../unittests/create-app.js';
+import { expectNthRequest, createApp } from '@/unittests';
 
 describe('Actions', () => {
     /** @type {App} */
@@ -9,7 +7,6 @@ describe('Actions', () => {
     beforeAll(() => {
         return createApp().then((a) => {
             app = a;
-            fetchMock.enableMocks();
         });
     });
 
@@ -19,7 +16,7 @@ describe('Actions', () => {
 
     test('empty actions execution', async () => {
         fetchMock.mockOnce(JSON.stringify([{ status: 200, data: { some: 'value' } }]));
-        const callback = jest.fn();
+        const callback = vitest.fn();
         const action = {
             name: 'test_action',
             title: 'Test actions',
@@ -31,9 +28,11 @@ describe('Actions', () => {
 
         await app.actions.execute({ action });
         expect(fetchMock.mock.calls).toHaveLength(1);
-        const [url, req] = fetchMock.mock.calls[0];
-        expect(url).toBe('http://localhost/api/endpoint/');
-        expect(JSON.parse(req.body)).toEqual([{ method: 'put', path: '/test/path/' }]);
+        expectNthRequest(0, {
+            method: 'PUT',
+            url: 'http://localhost/api/endpoint/',
+            body: [{ method: 'put', path: '/test/path/' }],
+        });
 
         expect(callback).toBeCalledTimes(1);
         const arg = callback.mock.calls[0][0];
@@ -45,7 +44,7 @@ describe('Actions', () => {
     });
 
     test('action with custom handler', () => {
-        const action = { name: 'test_action', handler: jest.fn() };
+        const action = { name: 'test_action', handler: vitest.fn() };
         app.actions.execute({ action });
 
         expect(action.handler).toBeCalledTimes(1);
@@ -80,10 +79,10 @@ describe('Actions', () => {
         });
         expect(result.data).toEqual({ some: 'return val' });
         expect(fetchMock).toBeCalledTimes(1);
-        const [url, req] = fetchMock.mock.calls[0];
-        expect(url).toBe('http://localhost/api/endpoint/');
-        expect(JSON.parse(req.body)).toEqual([
-            { method: 'patch', data: { testField: 'some val' }, path: 'execute' },
-        ]);
+        expectNthRequest(0, {
+            method: 'PUT',
+            path: '/api/endpoint/',
+            body: [{ method: 'patch', data: { testField: 'some val' }, path: 'execute' }],
+        });
     });
 });
diff --git a/frontend_src/vstutils/__tests__/composables.test.js b/frontend_src/vstutils/__tests__/composables.test.js
index 725953b6..8fc114bd 100644
--- a/frontend_src/vstutils/__tests__/composables.test.js
+++ b/frontend_src/vstutils/__tests__/composables.test.js
@@ -1,4 +1,3 @@
-import { test, beforeAll, expect, jest } from '@jest/globals';
 import { reactive, computed } from 'vue';
 import { createApp } from '@/unittests';
 import { StringField } from '@/vstutils/fields/text';
@@ -22,7 +21,7 @@ test('useModelFieldsGroups', () => {
 
     const data = { field3: 'some value' };
 
-    Model.fieldsGroups = jest.fn(() => [{ title: 'Some group', fields: ['field2'] }]);
+    Model.fieldsGroups = vitest.fn(() => [{ title: 'Some group', fields: ['field2'] }]);
 
     const filteredGroups = computed(() => getModelFieldsInstancesGroups(Model, data));
 
diff --git a/frontend_src/vstutils/__tests__/selected-filters.test.js b/frontend_src/vstutils/__tests__/selected-filters.test.js
index f81e9c10..64b22d6b 100644
--- a/frontend_src/vstutils/__tests__/selected-filters.test.js
+++ b/frontend_src/vstutils/__tests__/selected-filters.test.js
@@ -1,16 +1,8 @@
-import { expect, test, beforeAll } from '@jest/globals';
-import fetchMock from 'jest-fetch-mock';
-import { createApp, createSchema, mountApp, waitForPageLoading } from '@/unittests';
-
-let app;
-
-beforeAll(async () => {
-    app = await createApp({ schema: createSchema() });
-    fetchMock.enableMocks();
-});
+import { createApp, createSchema, useTestCtx, waitForPageLoading } from '@/unittests';
 
 test('Selected filters', async () => {
-    const wrapper = await mountApp();
+    const app = await createApp({ schema: createSchema() });
+    const { wrapper } = useTestCtx();
 
     fetchMock.mockResponseOnce(JSON.stringify([{ status: 200, data: { count: 0, results: [] } }]));
     await app.router.push('/user?id=1,2,3');
diff --git a/frontend_src/vstutils/api-fetch.ts b/frontend_src/vstutils/api-fetch.ts
new file mode 100644
index 00000000..d5344aa9
--- /dev/null
+++ b/frontend_src/vstutils/api-fetch.ts
@@ -0,0 +1,39 @@
+import type { InitAppConfig } from '@/vstutils/init-app';
+
+type InternalFetch = (req: Request) => Promise<Response>;
+
+interface CreateApiFetchParams {
+    fetch?: typeof fetch;
+    config: InitAppConfig;
+}
+
+export function createApiFetch({ config, fetch: _fetch = window.fetch }: CreateApiFetchParams): typeof fetch {
+    return internalFetchToFetch(createOauth2Fetch(config, _fetch));
+}
+
+function addHeadersToRequest(request: Request, headers: Record<string, string>): Request {
+    const newHeaders = new Headers(request.headers);
+    for (const [key, value] of Object.entries(headers)) {
+        newHeaders.set(key, value);
+    }
+    return new Request(request, { headers: newHeaders });
+}
+
+function createOauth2Fetch(config: InitAppConfig, _fetch: InternalFetch): InternalFetch {
+    const userManger = config.auth.userManager;
+    return async (request: Request) => {
+        const user = await userManger.getUser();
+        if (!user) {
+            throw new Error('User is not logged in');
+        }
+        return _fetch(
+            addHeadersToRequest(request, { Authorization: `${user.token_type} ${user.access_token}` }),
+        );
+    };
+}
+
+function internalFetchToFetch(_fetch: InternalFetch): typeof fetch {
+    return function fetch(input: RequestInfo | URL, init?: RequestInit) {
+        return _fetch(new Request(input, init));
+    };
+}
diff --git a/frontend_src/vstutils/api/ApiConnector.ts b/frontend_src/vstutils/api/ApiConnector.ts
index ee8da51f..26d38762 100644
--- a/frontend_src/vstutils/api/ApiConnector.ts
+++ b/frontend_src/vstutils/api/ApiConnector.ts
@@ -1,8 +1,11 @@
-import { BulkType, getCookie, guiLocalSettings, makeQueryString } from '@/vstutils/utils';
+import { BulkType, guiLocalSettings, makeQueryString } from '@/vstutils/utils';
 import { StatusError } from './StatusError';
 
-import type { AppConfiguration, AppSchema } from '@/vstutils/AppConfiguration';
+import type { AppSchema } from '@/vstutils/schema';
 import type { HttpMethod, InnerData } from '@/vstutils/utils';
+import { createApiFetch } from '../api-fetch';
+import { type InitAppConfig } from '../init-app';
+import { type IApp } from '../app';
 
 const isNativeCacheAvailable = 'caches' in window;
 
@@ -130,48 +133,52 @@ export type MakeRequestParams = MakeRequestParamsBulk | MakeRequestParamsFetch |
  * Class, that sends API requests.
  */
 export class ApiConnector {
-    appConfig: AppConfiguration | null = null;
+    appConfig: InitAppConfig | null = null;
     openapi: AppSchema | null = null;
     defaultVersion: string | null = null;
     endpointURL: string | null = null;
-    headers: Record<string, string | null>;
+    headers: Record<string, string | null | undefined>;
     bulkCollector: BulkCollector = { bulkParts: [] };
     baseURL: string | null = null;
     disableBulk = false;
     private _etagsCachePrefix: string | null = null;
     private _etagsCacheName: string | null = null;
+    fetch: typeof fetch = window.fetch;
 
     /**
      * Constructor of ApiConnector class.
      */
     constructor() {
         this.headers = {};
+    }
 
-        const csrftoken = getCookie('csrftoken');
-        if (csrftoken) {
-            this.headers['X-CSRFToken'] = csrftoken;
-        }
+    private initPromises: Promise<void>[] = [];
+
+    initialized() {
+        return Promise.all(this.initPromises);
     }
 
     /**
      * Method that sets application configuration. Must be called before making any requests.
      */
-    initConfiguration(appConfig: AppConfiguration): this {
-        this.appConfig = appConfig;
-        this.openapi = appConfig.schema;
+    initConfiguration(app: IApp): this {
+        this.appConfig = app.config;
+        this.openapi = app.schema;
         this.defaultVersion = this.openapi.info.version;
-        this.endpointURL = String(appConfig.endpointUrl); // TODO fetchMock does not support URL
+        this.endpointURL = String(new URL(app.config.api.endpointPath, app.config.api.url)); // TODO fetchMock does not support URL
 
-        // remove version and ending slash from path (/api/v1/)
-        const path = this.openapi.basePath?.replace(this.defaultVersion, '').replace(/\/$/, '');
-        this.baseURL = `${this.openapi.schemes![0]}://${this.openapi.host!}${path!}`;
+        this.baseURL = new URL(app.config.api.url).toString().replace(/\/$/, '');
 
         if (isNativeCacheAvailable) {
             this._etagsCachePrefix = 'etags-cache';
-            this._etagsCacheName = `${this._etagsCachePrefix}-${this.appConfig.fullUserVersion}`;
+            // TODO full version required for cache invalidation
+            this._etagsCacheName = `${this._etagsCachePrefix}-${app.version}`;
             void this._removeOldEtagsCaches();
         }
 
+        this.fetch = createApiFetch({ config: app.config });
+        this.disableBulk = app.config.api.disableBulk;
+
         return this;
     }
 
@@ -200,7 +207,7 @@ export class ApiConnector {
             if (query) {
                 realBulk.query = query;
             }
-            if (req.headers) {
+            if (req.headers && Object.keys(req.headers).length > 0) {
                 realBulk.headers = req.headers;
             }
             if (req.data) {
@@ -224,7 +231,7 @@ export class ApiConnector {
             const pathStr = Array.isArray(req.path) ? req.path.join('/') : req.path.replace(/^\//, '');
             const pathToSend = `${this.getFullUrl(pathStr)}${makeQueryString(req.query)}`;
 
-            const response = await fetch(pathToSend, {
+            const response = await this.fetch(pathToSend, {
                 method: req.method,
                 headers,
                 body: preparedData,
@@ -314,7 +321,7 @@ export class ApiConnector {
     }
 
     async sendBulk<Responses = undefined>(requests: RealBulkRequest[], type = BulkType.SIMPLE) {
-        const response = await fetch(this.endpointURL!, {
+        const response = await this.fetch(this.endpointURL!, {
             method: type,
             headers: { ...this.headers, 'Content-Type': 'application/json' },
             body: JSON.stringify(requests),
@@ -371,6 +378,9 @@ export class ApiConnector {
             } else {
                 results = await this.sendBulk(bulkData);
             }
+            if (results.length < bulkParts.length) {
+                throw new Error('Responses count does not match requests count');
+            }
             for (const [idx, item] of results.entries()) {
                 try {
                     APIResponse.checkStatus(item.status, item.data);
@@ -412,8 +422,8 @@ export class ApiConnector {
      * Method, that loads data of authorized user.
      */
     loadUser() {
-        return this.bulkQuery<InnerData>({
-            path: ['user', this.getUserId()],
+        return this.makeRequest<InnerData>({
+            path: ['user', 'profile'],
             method: 'get',
         }).then((response) => {
             return response.data;
diff --git a/frontend_src/vstutils/api/TranslationsManager.ts b/frontend_src/vstutils/api/TranslationsManager.ts
index 726f1fc4..693bc3f7 100644
--- a/frontend_src/vstutils/api/TranslationsManager.ts
+++ b/frontend_src/vstutils/api/TranslationsManager.ts
@@ -1,30 +1,35 @@
 import type { Cache } from '@/cache';
 import type { LocaleMessageObject } from 'vue-i18n';
-import { HttpMethods } from '../utils';
+import { type InitAppConfig } from '@/vstutils/init-app';
 
 export interface Language {
     code: string;
     name: string;
 }
 
-import type { ApiConnector } from './ApiConnector';
-
 /**
  * Class for requesting translations related data
  */
 export class TranslationsManager {
-    api: ApiConnector;
     cache: Cache;
+    config: InitAppConfig;
 
-    constructor(api: ApiConnector, cache: Cache) {
-        this.api = api;
-        this.cache = cache;
+    constructor(config: InitAppConfig) {
+        this.cache = config.cache;
+        this.config = config;
     }
 
-    loadLanguages(): Promise<Language[]> {
-        return this.api
-            .bulkQuery<{ results: Language[] }>({ path: '/_lang/', method: HttpMethods.GET })
-            .then((response) => response.data.results);
+    async loadLanguages(): Promise<Language[]> {
+        const response = await fetch(
+            new Request(new URL(this.config.api.endpointPath, this.config.api.url), {
+                method: 'PUT',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify([{ method: 'GET', path: ['_lang'] }]),
+            }),
+        );
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        const data = (await response.json())[0].data as { results: Language[] };
+        return data.results;
     }
 
     /**
@@ -44,13 +49,17 @@ export class TranslationsManager {
     /**
      * Method, that loads translations for some language from API.
      */
-    loadTranslations(lang: string): Promise<LocaleMessageObject> {
-        return this.api
-            .bulkQuery<{ translations: LocaleMessageObject }>({
-                path: ['_lang', lang],
-                method: HttpMethods.GET,
-            })
-            .then((response) => response.data.translations);
+    async loadTranslations(lang: string): Promise<LocaleMessageObject> {
+        const response = await fetch(
+            new Request(new URL(this.config.api.endpointPath, this.config.api.url), {
+                method: 'PUT',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify([{ method: 'GET', path: ['_lang', lang] }]),
+            }),
+        );
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        const data = (await response.json())[0].data as { translations: LocaleMessageObject };
+        return data.translations;
     }
 
     /**
diff --git a/frontend_src/vstutils/app.ts b/frontend_src/vstutils/app.ts
index 7c13684b..feae65b8 100644
--- a/frontend_src/vstutils/app.ts
+++ b/frontend_src/vstutils/app.ts
@@ -1,6 +1,6 @@
-import type { Vue } from 'vue/types/vue';
 import type { ComponentOptions } from 'vue';
 import type VueRouter from 'vue-router';
+import Vue from 'vue';
 
 import Centrifuge from 'centrifuge';
 import { defineStore } from 'pinia';
@@ -11,7 +11,7 @@ import type { ApiConnector } from '@/vstutils/api';
 import { apiConnector } from '@/vstutils/api';
 import type { Language } from '@/vstutils/api/TranslationsManager';
 import { TranslationsManager } from '@/vstutils/api/TranslationsManager';
-import type { AppConfiguration } from '@/vstutils/AppConfiguration';
+import type { AppSchema } from '@/vstutils/schema';
 import AppRoot from '@/vstutils/AppRoot.vue';
 import { AutoUpdateController } from '@/vstutils/autoupdate';
 import type { ComponentsRegistrator } from '@/vstutils/ComponentsRegistrator';
@@ -37,6 +37,7 @@ import type { IView, BaseView } from '@/vstutils/views';
 import { ListView, PageNewView, PageView, ViewsTree } from '@/vstutils/views';
 import ViewConstructor from '@/vstutils/views/ViewConstructor.js';
 import { setupPushNotifications } from '@/vstutils/webpush';
+import { type InitAppConfig } from '@/vstutils/init-app';
 
 import type { Cache } from '@/cache';
 import type { InnerData } from '@/vstutils/utils';
@@ -56,11 +57,13 @@ export function getCentrifugoClient(address?: string, token?: string) {
 type TAppRoot = InstanceType<typeof AppRoot>;
 
 export interface IApp {
-    config: AppConfiguration;
+    config: InitAppConfig;
     vue: typeof Vue;
     cache: Cache;
-
-    schema: AppConfiguration['schema'];
+    version: string;
+    defaultPageLimit: number;
+    schema: AppSchema;
+    projectName: string;
 
     fieldsResolver: FieldsResolver;
     modelsResolver: ModelsResolver;
@@ -98,12 +101,14 @@ export interface IApp {
 
     darkModeEnabled: boolean;
 
-    start(): void;
+    start(): Promise<void>;
     mount(target: HTMLElement | string): void;
 
     initActionConfirmationModal(options: { title: string }): Promise<void>;
     openReloadPageModal(): void;
     setLanguage(lang: string): void;
+
+    _mounted?: InstanceType<typeof Vue>;
 }
 
 export interface IAppInitialized extends IApp {
@@ -117,12 +122,20 @@ export interface IAppInitialized extends IApp {
     store: GlobalStoreInitialized;
 }
 
+interface AppParams {
+    config: InitAppConfig;
+    schema: AppSchema;
+    vue?: typeof Vue;
+}
+
 export class App implements IApp {
-    config: AppConfiguration;
+    config: InitAppConfig;
     vue: typeof Vue;
     cache: Cache;
-
-    schema: AppConfiguration['schema'];
+    version: string;
+    defaultPageLimit: number;
+    schema: AppSchema;
+    projectName: string;
 
     fieldsResolver: FieldsResolver;
     modelsResolver: ModelsResolver;
@@ -159,23 +172,27 @@ export class App implements IApp {
 
     rootVm: TAppRoot | null = null;
     application: unknown | null = null;
+    _mounted?: InstanceType<typeof Vue>;
 
-    constructor(config: AppConfiguration, cache: Cache, vue?: typeof Vue) {
+    constructor({ config, schema, vue }: AppParams) {
         globalThis.__currentApp = this;
         this.config = config;
 
-        this.vue = vue ?? globalThis.Vue;
-        this.schema = config.schema;
+        this.vue = vue ?? Vue;
+        this.schema = schema;
         this.router = null;
-        this.cache = cache;
+        this.cache = config.cache;
         this.i18n = i18n;
+        this.version = this.schema.info['x-versions'].application;
+        this.defaultPageLimit = this.schema.info['x-page-limit'] ?? 20;
+        this.projectName = this.schema.info.title;
 
         /**
          * Object, that manages connection with API (sends API requests).
          */
-        this.api = apiConnector.initConfiguration(config);
+        this.api = apiConnector.initConfiguration(this);
 
-        this.translationsManager = new TranslationsManager(apiConnector, cache);
+        this.translationsManager = new TranslationsManager(config);
 
         this.centrifugoClient = getCentrifugoClient(
             this.schema.info['x-centrifugo-address'],
@@ -206,9 +223,9 @@ export class App implements IApp {
         this.appRootComponent = AppRoot as unknown as ComponentOptions<Vue>;
         this.additionalRootMixins = [];
 
-        this.fieldsResolver = new FieldsResolver(this.config.schema);
+        this.fieldsResolver = new FieldsResolver(this.schema);
         addDefaultFields(this.fieldsResolver);
-        this.modelsResolver = new ModelsResolver(this.fieldsResolver, this.config.schema);
+        this.modelsResolver = new ModelsResolver(this.fieldsResolver, this.schema);
 
         /** @type {QuerySetsResolver} */
         this.qsResolver = null;
@@ -226,10 +243,20 @@ export class App implements IApp {
 
         setupPushNotifications(this);
 
+        config.auth.userManager.startSilentRenew();
+        config.auth.userManager.events.addSilentRenewError((e) => {
+            if ('error' in e && e.error === 'invalid_request') {
+                window.location.reload();
+                return;
+            }
+            console.log('Silent renew error', e);
+        });
+
         signals.emit(APP_CREATED, this);
     }
 
     async start() {
+        await this.api.initialized();
         if (this.centrifugoClient) {
             this.centrifugoClient.connect();
         }
@@ -277,7 +304,7 @@ export class App implements IApp {
 
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         this.views = new ViewConstructor(undefined, this.modelsResolver, this.fieldsResolver).generateViews(
-            this.config.schema,
+            this.schema,
         );
 
         this.viewsTree = new ViewsTree(this.views);
@@ -287,7 +314,7 @@ export class App implements IApp {
     }
 
     generateDefinitionsModels() {
-        for (const name of Object.keys(this.config.schema.definitions)) {
+        for (const name of Object.keys(this.schema.definitions)) {
             this.modelsResolver.byReferencePath(`#/definitions/${name}`);
         }
         signals.emit(SCHEMA_MODELS_CREATED, { app: this, models: this.modelsResolver._definitionsModels });
@@ -434,9 +461,9 @@ export class App implements IApp {
         this.rootVm = new Vue({
             mixins: [this.appRootComponent, ...this.additionalRootMixins],
             propsData: {
-                info: this.config.schema.info,
-                x_menu: this.config.schema.info['x-menu'],
-                x_docs: this.config.schema.info['x-docs'],
+                info: this.schema.info,
+                x_menu: this.schema.info['x-menu'],
+                x_docs: this.schema.info['x-docs'],
             },
             pinia,
             router: this.router,
@@ -451,11 +478,12 @@ export class App implements IApp {
         return (this.userSettingsStore?.settings.main?.dark_mode as boolean | undefined) ?? false;
     }
 
-    mount(target: HTMLElement | string = '#RealBody') {
+    mount(target: HTMLElement | string) {
         if (!this.rootVm) {
             throw new Error('Please initialize app first');
         }
-        this.rootVm.$mount(target);
+        // @ts-expect-error Vue 2 types is a mess
+        this._mounted = this.rootVm.$mount(target);
     }
 
     initActionConfirmationModal({ title }: { title: string }): Promise<void> {
diff --git a/frontend_src/vstutils/auth-app.ts b/frontend_src/vstutils/auth-app.ts
new file mode 100644
index 00000000..05bc3371
--- /dev/null
+++ b/frontend_src/vstutils/auth-app.ts
@@ -0,0 +1,15 @@
+import { type InitAppConfig } from './init-app';
+
+export interface CreateAuthAppParams {
+    config: InitAppConfig;
+    openMainApp: (path?: string) => void;
+}
+
+export interface AuthApp {
+    mount: (el: HTMLElement | string) => void;
+    destroy: () => void;
+}
+
+export type AuthAppFactory = (params: CreateAuthAppParams) => AuthApp | Promise<AuthApp>;
+
+export const createAuthAppFactory = (f: AuthAppFactory) => f;
diff --git a/frontend_src/vstutils/autoupdate/__tests__/AutoUpdateController.test.js b/frontend_src/vstutils/autoupdate/__tests__/AutoUpdateController.test.js
index 1e2907d6..ad2352e9 100644
--- a/frontend_src/vstutils/autoupdate/__tests__/AutoUpdateController.test.js
+++ b/frontend_src/vstutils/autoupdate/__tests__/AutoUpdateController.test.js
@@ -1,4 +1,3 @@
-import { expect, describe, test, jest } from '@jest/globals';
 import Centrifuge from 'centrifuge';
 import { AutoUpdateController } from '../AutoUpdateController.ts';
 
@@ -6,7 +5,7 @@ describe('AutoUpdateController', () => {
     test('timer subscriptions', () => {
         const controller = new AutoUpdateController(null);
 
-        const callback = jest.fn();
+        const callback = vitest.fn();
         expect(controller.timerSubscribers.size).toBe(0);
 
         controller.subscribe({
@@ -32,8 +31,8 @@ describe('AutoUpdateController', () => {
         const channelSubscriptions = controller.channelSubscriptions;
         const channelSubscribers = controller.channelSubscribers;
 
-        const callback1 = jest.fn();
-        const callback2 = jest.fn();
+        const callback1 = vitest.fn();
+        const callback2 = vitest.fn();
 
         expect(subscribers.size).toBe(0);
 
diff --git a/frontend_src/app_loader/cleanCacheHelpers.js b/frontend_src/vstutils/cleanCacheHelpers.js
similarity index 100%
rename from frontend_src/app_loader/cleanCacheHelpers.js
rename to frontend_src/vstutils/cleanCacheHelpers.js
diff --git a/frontend_src/vstutils/components/Spinner.vue b/frontend_src/vstutils/components/Spinner.vue
new file mode 100644
index 00000000..916931b4
--- /dev/null
+++ b/frontend_src/vstutils/components/Spinner.vue
@@ -0,0 +1,76 @@
+<template>
+    <span class="loader" />
+</template>
+
+<style scoped>
+    .loader {
+        --color: 0 0 0;
+
+        font-size: 10px;
+        width: 1em;
+        height: 1em;
+        border-radius: 50%;
+        position: relative;
+        text-indent: -9999em;
+        animation: spinner 1.1s infinite ease;
+        transform: translateZ(0);
+    }
+    @keyframes spinner {
+        0%,
+        100% {
+            box-shadow: 0 -2.6em 0 0 #fff, 1.8em -1.8em 0 0 rgb(var(--color) / 20%),
+                2.5em 0 0 0 rgb(var(--color) / 20%), 1.75em 1.75em 0 0 rgb(var(--color) / 20%),
+                0 2.5em 0 0 rgb(var(--color) / 20%), -1.8em 1.8em 0 0 rgb(var(--color) / 20%),
+                -2.6em 0 0 0 rgb(var(--color) / 50%), -1.8em -1.8em 0 0 rgb(var(--color) / 70%);
+        }
+
+        12.5% {
+            box-shadow: 0 -2.6em 0 0 rgb(var(--color) / 70%), 1.8em -1.8em 0 0 #fff,
+                2.5em 0 0 0 rgb(var(--color) / 20%), 1.75em 1.75em 0 0 rgb(var(--color) / 20%),
+                0 2.5em 0 0 rgb(var(--color) / 20%), -1.8em 1.8em 0 0 rgb(var(--color) / 20%),
+                -2.6em 0 0 0 rgb(var(--color) / 20%), -1.8em -1.8em 0 0 rgb(var(--color) / 50%);
+        }
+
+        25% {
+            box-shadow: 0 -2.6em 0 0 rgb(var(--color) / 50%), 1.8em -1.8em 0 0 rgb(var(--color) / 70%),
+                2.5em 0 0 0 #fff, 1.75em 1.75em 0 0 rgb(var(--color) / 20%),
+                0 2.5em 0 0 rgb(var(--color) / 20%), -1.8em 1.8em 0 0 rgb(var(--color) / 20%),
+                -2.6em 0 0 0 rgb(var(--color) / 20%), -1.8em -1.8em 0 0 rgb(var(--color) / 20%);
+        }
+
+        37.5% {
+            box-shadow: 0 -2.6em 0 0 rgb(var(--color) / 20%), 1.8em -1.8em 0 0 rgb(var(--color) / 50%),
+                2.5em 0 0 0 rgb(var(--color) / 70%), 1.75em 1.75em 0 0 #fff,
+                0 2.5em 0 0 rgb(var(--color) / 20%), -1.8em 1.8em 0 0 rgb(var(--color) / 20%),
+                -2.6em 0 0 0 rgb(var(--color) / 20%), -1.8em -1.8em 0 0 rgb(var(--color) / 20%);
+        }
+
+        50% {
+            box-shadow: 0 -2.6em 0 0 rgb(var(--color) / 20%), 1.8em -1.8em 0 0 rgb(var(--color) / 20%),
+                2.5em 0 0 0 rgb(var(--color) / 50%), 1.75em 1.75em 0 0 rgb(var(--color) / 70%),
+                0 2.5em 0 0 #fff, -1.8em 1.8em 0 0 rgb(var(--color) / 20%),
+                -2.6em 0 0 0 rgb(var(--color) / 20%), -1.8em -1.8em 0 0 rgb(var(--color) / 20%);
+        }
+
+        62.5% {
+            box-shadow: 0 -2.6em 0 0 rgb(var(--color) / 20%), 1.8em -1.8em 0 0 rgb(var(--color) / 20%),
+                2.5em 0 0 0 rgb(var(--color) / 20%), 1.75em 1.75em 0 0 rgb(var(--color) / 50%),
+                0 2.5em 0 0 rgb(var(--color) / 70%), -1.8em 1.8em 0 0 #fff,
+                -2.6em 0 0 0 rgb(var(--color) / 20%), -1.8em -1.8em 0 0 rgb(var(--color) / 20%);
+        }
+
+        75% {
+            box-shadow: 0 -2.6em 0 0 rgb(var(--color) / 20%), 1.8em -1.8em 0 0 rgb(var(--color) / 20%),
+                2.5em 0 0 0 rgb(var(--color) / 20%), 1.75em 1.75em 0 0 rgb(var(--color) / 20%),
+                0 2.5em 0 0 rgb(var(--color) / 50%), -1.8em 1.8em 0 0 rgb(var(--color) / 70%),
+                -2.6em 0 0 0 #fff, -1.8em -1.8em 0 0 rgb(var(--color) / 20%);
+        }
+
+        87.5% {
+            box-shadow: 0 -2.6em 0 0 rgb(var(--color) / 20%), 1.8em -1.8em 0 0 rgb(var(--color) / 20%),
+                2.5em 0 0 0 rgb(var(--color) / 20%), 1.75em 1.75em 0 0 rgb(var(--color) / 20%),
+                0 2.5em 0 0 rgb(var(--color) / 20%), -1.8em 1.8em 0 0 rgb(var(--color) / 50%),
+                -2.6em 0 0 0 rgb(var(--color) / 70%), -1.8em -1.8em 0 0 #fff;
+        }
+    }
+</style>
diff --git a/frontend_src/vstutils/components/items/ControlSidebar.vue b/frontend_src/vstutils/components/items/ControlSidebar.vue
index a06d66bd..264ab758 100644
--- a/frontend_src/vstutils/components/items/ControlSidebar.vue
+++ b/frontend_src/vstutils/components/items/ControlSidebar.vue
@@ -3,7 +3,7 @@
         <div class="p-3 control-sidebar-content">
             <div>
                 <b>{{ $u.capitalize($tc('version', 1)) }}:</b>
-                <code>{{ $app.config.projectVersion }}</code>
+                <code>{{ $app.version }}</code>
             </div>
 
             <component :is="btn.component" v-for="(btn, idx) in buttons" v-bind="btn.props" :key="idx" />
@@ -44,6 +44,7 @@
 </template>
 
 <script lang="ts">
+    import { cleanAllCacheAndReloadPage } from '@/vstutils/cleanCacheHelpers.js';
     import { HelpModal } from './modal';
     import ControlSidebarButton from './ControlSidebarButton.vue';
     import ConfirmModal from '../common/ConfirmModal.vue';
@@ -95,7 +96,9 @@
                     {
                         component: ControlSidebarButton,
                         props: {
-                            href: this.$app.config.endpointUrl.href,
+                            href: String(
+                                new URL(this.$app.config.api.endpointPath, this.$app.config.api.url),
+                            ),
                             iconClass: 'fa fa-toolbox',
                             text: 'API',
                         },
@@ -130,7 +133,7 @@
                 this.localSettings.setValue(options);
             },
             cleanAllCache() {
-                window.cleanAllCacheAndReloadPage();
+                cleanAllCacheAndReloadPage();
             },
             closeControlSidebar(ev: Event) {
                 if ((ev as KeyboardEvent).key === 'Escape') {
diff --git a/frontend_src/vstutils/components/items/index.js b/frontend_src/vstutils/components/items/index.js
index a09232de..69383ff1 100644
--- a/frontend_src/vstutils/components/items/index.js
+++ b/frontend_src/vstutils/components/items/index.js
@@ -3,6 +3,6 @@ export * from './modal';
 export * from './nav';
 export * from './sidebar';
 
-import ControlSidebar from './ControlSidebar';
-import ControlSidebarButton from './ControlSidebarButton';
+import ControlSidebar from './ControlSidebar.vue';
+import ControlSidebarButton from './ControlSidebarButton.vue';
 export { ControlSidebar, ControlSidebarButton };
diff --git a/frontend_src/vstutils/components/items/modal/HelpModal.vue b/frontend_src/vstutils/components/items/modal/HelpModal.vue
index 5527e009..d4bf8a24 100644
--- a/frontend_src/vstutils/components/items/modal/HelpModal.vue
+++ b/frontend_src/vstutils/components/items/modal/HelpModal.vue
@@ -46,9 +46,10 @@
 </template>
 
 <script>
+    import { cleanAllCacheAndReloadPage } from '@/vstutils/cleanCacheHelpers.js';
     import ModalWindowAndButtonMixin from '../../../fields/ModalWindowAndButtonMixin.js';
     import BootstrapModal from './../../BootstrapModal.vue';
-    import ControlSidebarButton from '../ControlSidebarButton';
+    import ControlSidebarButton from '../ControlSidebarButton.vue';
 
     export default {
         name: 'HelpModal',
@@ -64,7 +65,7 @@
                 return Array.isArray(item);
             },
             resetAll() {
-                window.cleanAllCacheAndReloadPage({ resetAll: true });
+                cleanAllCacheAndReloadPage({ resetAll: true });
             },
         },
     };
diff --git a/frontend_src/vstutils/components/items/nav/TopNavigation.vue b/frontend_src/vstutils/components/items/nav/TopNavigation.vue
index 871fddda..114f2a3d 100644
--- a/frontend_src/vstutils/components/items/nav/TopNavigation.vue
+++ b/frontend_src/vstutils/components/items/nav/TopNavigation.vue
@@ -50,10 +50,10 @@
                         <div class="dropdown-divider" />
                     </template>
 
-                    <a :href="logout_url" class="dropdown-item">
+                    <button type="button" class="dropdown-item" @click="logout">
                         <i class="fas fa-sign-out-alt mr-2 ico-data-default" />
                         {{ $u.capitalize($t('logout')) }}
-                    </a>
+                    </button>
                 </div>
             </li>
             <li v-else class="nav-item">
@@ -129,24 +129,6 @@
 
                 return url;
             },
-            /**
-             * Property, that returns URL to openapi.
-             */
-            openapi_url() {
-                return window.openapi_path;
-            },
-            /**
-             * Property, that returns logout URL.
-             */
-            logout_url() {
-                return this.$app.config.urls.logout;
-            },
-            /**
-             * Property, that returns login URL.
-             */
-            login_url() {
-                return this.$app.config.urls.login;
-            },
         },
         mounted() {
             $(this.$refs.sidebarControl).PushMenu();
@@ -169,6 +151,9 @@
                 el.src = this.getDefaultGravatarImg();
                 return false;
             },
+            async logout() {
+                await this.$app.config.logoutHandler({ config: this.$app.config });
+            },
         },
     };
 </script>
diff --git a/frontend_src/vstutils/components/items/sidebar/utils.ts b/frontend_src/vstutils/components/items/sidebar/utils.ts
index ad41e11f..1a08ef0f 100644
--- a/frontend_src/vstutils/components/items/sidebar/utils.ts
+++ b/frontend_src/vstutils/components/items/sidebar/utils.ts
@@ -1,7 +1,7 @@
 import $ from 'jquery';
 import type { RawLocation } from 'vue-router';
 import type { Action } from '../../../views';
-import type { XMenu } from '../../../AppConfiguration';
+import type { XMenu } from '../../../schema';
 import { getApp } from '../../../utils';
 
 export interface MenuItem {
diff --git a/frontend_src/vstutils/components/wysiwyg-editor/index.ts b/frontend_src/vstutils/components/wysiwyg-editor/index.ts
index 31c71707..8ff2ba41 100644
--- a/frontend_src/vstutils/components/wysiwyg-editor/index.ts
+++ b/frontend_src/vstutils/components/wysiwyg-editor/index.ts
@@ -29,11 +29,9 @@ const realComponent = (readOnly: boolean, lang?: LangInfo) =>
         const [ToastUIEditor, ToastUIEditorVue] = await Promise.all([
             import('@toast-ui/editor'),
             import('@toast-ui/vue-editor'),
-            // @ts-expect-error Styles are not typed
             import('@toast-ui/editor/dist/toastui-editor.css'),
             getApp().darkModeEnabled
-                ? // @ts-expect-error Styles are not typed
-                  import('@toast-ui/editor/dist/theme/toastui-editor-dark.css')
+                ? import('@toast-ui/editor/dist/theme/toastui-editor-dark.css')
                 : Promise.resolve(),
         ]);
         if (lang) {
diff --git a/frontend_src/vstutils/default-auth-app/components/BackButton.vue b/frontend_src/vstutils/default-auth-app/components/BackButton.vue
new file mode 100644
index 00000000..c89edf67
--- /dev/null
+++ b/frontend_src/vstutils/default-auth-app/components/BackButton.vue
@@ -0,0 +1,13 @@
+<template>
+    <button class="btn btn-secondary btn-block" type="button" @click="() => router.back()">
+        {{ i18n.t('Go back') }}
+    </button>
+</template>
+
+<script setup lang="ts">
+    import { useRouter } from 'vue-router/composables';
+    import { useTranslationsManager } from './../helpers';
+
+    const { i18n } = useTranslationsManager();
+    const router = useRouter();
+</script>
diff --git a/frontend_src/vstutils/default-auth-app/components/FormGroup.vue b/frontend_src/vstutils/default-auth-app/components/FormGroup.vue
new file mode 100644
index 00000000..740ad09c
--- /dev/null
+++ b/frontend_src/vstutils/default-auth-app/components/FormGroup.vue
@@ -0,0 +1,35 @@
+<template>
+    <div class="form-group">
+        <label :for="inputId">
+            <slot name="label">
+                <template v-if="label">
+                    {{ $t(label) }}
+                </template>
+            </slot>
+        </label>
+        <slot :id="inputId" :classes="formControlClasses" />
+        <div v-if="errors?.length" class="invalid-feedback">
+            <p v-for="error in errors" :key="error">{{ $t(error) }}</p>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+    let lastId = 0;
+</script>
+
+<script setup lang="ts">
+    import { computed } from 'vue';
+
+    const props = defineProps<{
+        label?: string;
+        name?: string;
+        errors?: string[];
+    }>();
+
+    const id = lastId++;
+    const inputId = `form-group-${id}`;
+    const formControlClasses = computed(() => {
+        return ['form-control', { 'is-invalid': (props.errors?.length ?? 0) > 0 }];
+    });
+</script>
diff --git a/frontend_src/vstutils/default-auth-app/components/LangForm.vue b/frontend_src/vstutils/default-auth-app/components/LangForm.vue
new file mode 100644
index 00000000..c03c1e2d
--- /dev/null
+++ b/frontend_src/vstutils/default-auth-app/components/LangForm.vue
@@ -0,0 +1,35 @@
+<template>
+    <form class="lang-form" method="get">
+        <select v-model="currentLang" class="custom-select" name="lang">
+            <option
+                v-for="{ code, name } in translationsManager.availableLanguages"
+                :key="code"
+                :value="code"
+            >
+                {{ name }}
+            </option>
+        </select>
+    </form>
+</template>
+
+<script setup lang="ts">
+    import { ref, watch } from 'vue';
+    import { useTranslationsManager } from './../helpers';
+
+    const translationsManager = useTranslationsManager();
+
+    const currentLang = ref(translationsManager.i18n.locale);
+
+    watch(currentLang, (newLang) => {
+        translationsManager.setLanguage(newLang);
+    });
+</script>
+
+<style scoped>
+    .lang-form {
+        width: 120px;
+        top: 10px;
+        right: 10px;
+        position: absolute;
+    }
+</style>
diff --git a/frontend_src/vstutils/default-auth-app/components/Layout.vue b/frontend_src/vstutils/default-auth-app/components/Layout.vue
new file mode 100644
index 00000000..419ce454
--- /dev/null
+++ b/frontend_src/vstutils/default-auth-app/components/Layout.vue
@@ -0,0 +1,34 @@
+<template>
+    <div class="wrapper">
+        <LangForm />
+        <div class="page">
+            <slot />
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+    import LangForm from './LangForm.vue';
+</script>
+
+<style scoped>
+    .wrapper {
+        position: absolute;
+        width: 100vw;
+        height: 100vh;
+        background-color: #e9ecef;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .page {
+        max-width: 450px;
+        background-color: #fff;
+        padding: 20px;
+        border-radius: 0.25rem;
+        width: 400px;
+        max-width: 100%;
+        margin: 10px;
+    }
+</style>
diff --git a/frontend_src/vstutils/default-auth-app/components/Oauth2ClientCredentialsGrantPageWrapper.vue b/frontend_src/vstutils/default-auth-app/components/Oauth2ClientCredentialsGrantPageWrapper.vue
new file mode 100644
index 00000000..8030b335
--- /dev/null
+++ b/frontend_src/vstutils/default-auth-app/components/Oauth2ClientCredentialsGrantPageWrapper.vue
@@ -0,0 +1,84 @@
+<template>
+    <div>
+        <slot
+            v-if="secondFactorRequired"
+            name="second-factor"
+            :provide-second-factor="provideSecondFactor"
+            :is-loading="isLoading"
+            :error="error"
+        />
+        <slot v-else :login="login" :is-loading="isLoading" :error="error" />
+    </div>
+</template>
+
+<script lang="ts">
+    import { ref } from 'vue';
+    import { ErrorResponse } from 'oidc-client-ts';
+    import { useOauth2UserManager, useMainAppOpener } from './../helpers';
+
+    export default {
+        setup() {
+            const isLoading = ref(false);
+            const secondFactorRequired = ref(false);
+            const userManager = useOauth2UserManager();
+            const openMainApp = useMainAppOpener();
+            const error = ref<'INVALID_CREDENTIALS' | 'OTHER_ERROR'>();
+
+            async function _loginWithSecondFactor(username: string, password: string, secondFactor?: string) {
+                try {
+                    // @ts-expect-error Its actually writable
+                    userManager.settings.extraTokenParams = { second_factor: secondFactor };
+                    return await userManager.signinResourceOwnerCredentials({
+                        username,
+                        password,
+                    });
+                } finally {
+                    // @ts-expect-error Its actually writable
+                    userManager.settings.extraTokenParams = {};
+                }
+            }
+
+            let usernameForSecondFactor = '';
+            let passwordForSecondFactor = '';
+
+            async function _login(username: string, password: string, secondFactor?: string) {
+                isLoading.value = true;
+                error.value = undefined;
+                try {
+                    await _loginWithSecondFactor(username, password, secondFactor);
+                    openMainApp();
+                } catch (e) {
+                    if (e instanceof ErrorResponse && e.error === 'invalid_request') {
+                        if (e.error_description === 'Missing or invalid "second_factor" in request.') {
+                            if (secondFactorRequired.value) {
+                                error.value = 'INVALID_CREDENTIALS';
+                                return;
+                            } else {
+                                secondFactorRequired.value = true;
+                                usernameForSecondFactor = username;
+                                passwordForSecondFactor = password;
+                                return;
+                            }
+                        }
+                        error.value = 'INVALID_CREDENTIALS';
+                        return;
+                    }
+                    console.error(e);
+                    error.value = 'OTHER_ERROR';
+                } finally {
+                    isLoading.value = false;
+                }
+            }
+
+            function login(username: string, password: string) {
+                return _login(username, password);
+            }
+
+            function provideSecondFactor(secondFactor?: string) {
+                return _login(usernameForSecondFactor, passwordForSecondFactor, secondFactor);
+            }
+
+            return { login, provideSecondFactor, secondFactorRequired, isLoading, error };
+        },
+    };
+</script>
diff --git a/frontend_src/vstutils/default-auth-app/helpers.ts b/frontend_src/vstutils/default-auth-app/helpers.ts
new file mode 100644
index 00000000..16313f50
--- /dev/null
+++ b/frontend_src/vstutils/default-auth-app/helpers.ts
@@ -0,0 +1,55 @@
+import { type UserManager } from 'oidc-client-ts';
+import { provide, type InjectionKey, inject } from 'vue';
+import type VueI18n from 'vue-i18n';
+import { type InitAppConfig } from '@/vstutils/init-app';
+import { TranslationsManager } from '../api/TranslationsManager';
+import { createVueI18n } from '../translation';
+import { getCookie } from '../utils';
+
+function createProviderWithInjector<T>(name: string) {
+    const key = Symbol(name) as InjectionKey<T>;
+    return {
+        provide: (value: T) => provide(key, value),
+        inject: () => {
+            const value = inject(key);
+            if (!value) {
+                throw new Error(`${name} is not provided`);
+            }
+            return value;
+        },
+    };
+}
+
+export const { provide: provideOauth2UserManager, inject: useOauth2UserManager } =
+    createProviderWithInjector<UserManager>('UserManager');
+
+export const { provide: provideMainAppOpener, inject: useMainAppOpener } =
+    createProviderWithInjector<() => void>('mainAppOpener');
+
+export const { provide: provideTranslationsManager, inject: useTranslationsManager } =
+    createProviderWithInjector<{
+        i18n: VueI18n;
+        availableLanguages: { code: string; name: string }[];
+        setLanguage: (code: string) => Promise<void>;
+    }>('TranslationManager');
+
+export const { provide: provideInitAppConfig, inject: useInitAppConfig } =
+    createProviderWithInjector<InitAppConfig>('InitAppConfig');
+
+export async function createTranslationsManager(config: InitAppConfig) {
+    const baseTranslationsManager = new TranslationsManager(config);
+    const i18n = createVueI18n();
+    const availableLanguages = await baseTranslationsManager.getLanguages();
+    i18n.locale = document.documentElement.lang || getCookie('lang') || availableLanguages[0]?.code || 'en';
+    if (availableLanguages.length > 0) {
+        i18n.setLocaleMessage(i18n.locale, await baseTranslationsManager.getTranslations(i18n.locale));
+    }
+    return {
+        availableLanguages,
+        i18n,
+        async setLanguage(code: string) {
+            i18n.locale = code;
+            i18n.setLocaleMessage(code, await baseTranslationsManager.getTranslations(code));
+        },
+    };
+}
diff --git a/frontend_src/vstutils/default-auth-app/index.ts b/frontend_src/vstutils/default-auth-app/index.ts
new file mode 100644
index 00000000..990c16b2
--- /dev/null
+++ b/frontend_src/vstutils/default-auth-app/index.ts
@@ -0,0 +1,121 @@
+import Vue, { type Component, type AsyncComponent, h, defineAsyncComponent } from 'vue';
+import VueRouter, { type RouteConfig } from 'vue-router';
+import { type AuthAppFactory } from '@/vstutils/auth-app';
+import {
+    provideOauth2UserManager,
+    provideMainAppOpener,
+    provideTranslationsManager,
+    provideInitAppConfig,
+    createTranslationsManager,
+} from './helpers';
+
+export const createDefaultAuthApp = customizeDefaultAuthAppCreator({});
+
+export function customizeDefaultAuthAppCreator({
+    components,
+}: {
+    components?: {
+        layout?: Component;
+        loginPage?: Component;
+        registrationPage?: Component;
+        registrationConfirmEmailPage?: Component;
+        passwordResetPage?: Component;
+        passwordResetConfirmPage?: Component;
+    };
+}) {
+    return createBaseAuthApp({
+        routes: [
+            {
+                path: '/auth/login',
+                name: 'login',
+                component:
+                    components?.loginPage ??
+                    defineAsyncComponent(async () => (await import('./pages/Login.vue')).default),
+            },
+            {
+                path: '/auth/registration',
+                name: 'registration',
+                component:
+                    components?.registrationPage ??
+                    defineAsyncComponent(async () => (await import('./pages/Registration.vue')).default),
+            },
+            {
+                path: '/auth/registration/confirm-email/:code',
+                name: 'registration-confirm-email',
+                component:
+                    components?.registrationConfirmEmailPage ??
+                    defineAsyncComponent(
+                        async () => (await import('./pages/RegistrationConfirmEmail.vue')).default,
+                    ),
+            },
+            {
+                path: '/auth/password-reset',
+                name: 'password-reset',
+                component:
+                    components?.passwordResetPage ??
+                    defineAsyncComponent(async () => (await import('./pages/PasswordReset.vue')).default),
+            },
+            {
+                path: '/auth/password-reset/:uid/:token',
+                name: 'password-reset-confirm',
+                component:
+                    components?.passwordResetConfirmPage ??
+                    defineAsyncComponent(
+                        async () => (await import('./pages/PasswordResetConfirm.vue')).default,
+                    ),
+            },
+            {
+                path: '*',
+                redirect: { name: 'login' },
+            },
+        ],
+        layoutComponent:
+            components?.layout ??
+            defineAsyncComponent(async () => (await import('./components/Layout.vue')).default),
+    });
+}
+
+export function createBaseAuthApp(params: {
+    routes: RouteConfig[];
+    layoutComponent?: Component | AsyncComponent;
+}): AuthAppFactory {
+    return async ({ config, openMainApp }) => {
+        Vue.use(VueRouter);
+
+        const router = new VueRouter({
+            routes: params.routes,
+        });
+
+        const { availableLanguages, i18n, setLanguage } = await createTranslationsManager(config);
+
+        const vm = new Vue({
+            setup() {
+                provideOauth2UserManager(config.auth.userManager);
+                provideMainAppOpener(openMainApp);
+                provideInitAppConfig(config);
+                provideTranslationsManager({
+                    availableLanguages,
+                    i18n,
+                    setLanguage,
+                });
+                return () => {
+                    if (params.layoutComponent) {
+                        return h(params.layoutComponent, [h('router-view')]);
+                    }
+                    return h('router-view');
+                };
+            },
+            i18n,
+            router,
+        });
+
+        return {
+            mount(el: HTMLElement | string) {
+                vm.$mount(el);
+            },
+            destroy() {
+                vm.$destroy();
+            },
+        };
+    };
+}
diff --git a/frontend_src/vstutils/default-auth-app/pages/Login.vue b/frontend_src/vstutils/default-auth-app/pages/Login.vue
new file mode 100644
index 00000000..406a11bc
--- /dev/null
+++ b/frontend_src/vstutils/default-auth-app/pages/Login.vue
@@ -0,0 +1,105 @@
+<template>
+    <Oauth2ClientCredentialsGrantPageWrapper>
+        <template #default="{ login, error }">
+            <form @submit.prevent="() => login(username, password)">
+                <p style="text-align: center">
+                    {{ signInTo }} {{ $t('or') }}
+                    <router-link :to="{ name: 'registration' }">{{ $t('sign up') }}</router-link
+                    >.
+                </p>
+                <div class="form-group has-feedback">
+                    <input
+                        id="username"
+                        v-model="username"
+                        autocomplete="username"
+                        autofocus
+                        class="form-control"
+                        maxlength="254"
+                        name="username"
+                        :placeholder="$t('Username').toString()"
+                        required
+                        type="text"
+                    />
+                </div>
+                <div class="form-group has-feedback">
+                    <input
+                        id="password"
+                        v-model="password"
+                        autocomplete="current-password"
+                        class="form-control"
+                        name="password"
+                        :placeholder="$t('Password').toString()"
+                        type="password"
+                        required
+                    />
+                </div>
+                <div v-if="error" class="alert alert-danger" role="alert">
+                    {{
+                        error === 'INVALID_CREDENTIALS'
+                            ? $t('Invalid username or password')
+                            : $t('Error! Try again later')
+                    }}
+                </div>
+                <button
+                    class="btn btn-primary btn-block"
+                    style="margin-bottom: 5px; text-transform: capitalize"
+                    type="submit"
+                >
+                    {{ $t('sign in') }}
+                </button>
+                <router-link :to="{ name: 'password-reset' }" style="text-transform: capitalize">
+                    {{ $t('forgot password') }}?
+                </router-link>
+            </form>
+        </template>
+        <template #second-factor="{ provideSecondFactor, error }">
+            <form @submit.prevent="() => provideSecondFactor(secondFactor)">
+                <FormGroup v-slot="{ id, classes }" label="Authentication code">
+                    <input :id="id" v-model="secondFactor" :class="classes" type="text" inputmode="numeric" />
+                </FormGroup>
+
+                <p>
+                    {{
+                        $t(
+                            "Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes.",
+                        )
+                    }}
+                </p>
+
+                <div v-if="error" class="alert alert-danger" role="alert">
+                    {{ error === 'INVALID_CREDENTIALS' ? 'Invalid code' : 'Error! Try again later' }}
+                </div>
+
+                <button
+                    type="submit"
+                    class="btn btn-primary btn-block"
+                    style="margin-bottom: 5px; text-transform: capitalize"
+                >
+                    {{ $t('sign in') }}
+                </button>
+            </form>
+        </template>
+    </Oauth2ClientCredentialsGrantPageWrapper>
+</template>
+
+<script lang="ts">
+    import { computed, ref } from 'vue';
+    import Oauth2ClientCredentialsGrantPageWrapper from './../components/Oauth2ClientCredentialsGrantPageWrapper.vue';
+    import { useTranslationsManager } from './../helpers';
+    import FormGroup from '../components/FormGroup.vue';
+
+    export default {
+        components: { FormGroup, Oauth2ClientCredentialsGrantPageWrapper },
+        setup() {
+            const { i18n } = useTranslationsManager();
+            const signInTo = computed(() => {
+                const msg = i18n.t('sign in to start your session') as string;
+                return msg.slice(0, 1).toUpperCase() + msg.slice(1);
+            });
+            const username = ref('');
+            const password = ref('');
+            const secondFactor = ref('');
+            return { username, password, secondFactor, signInTo };
+        },
+    };
+</script>
diff --git a/frontend_src/vstutils/default-auth-app/pages/PasswordReset.vue b/frontend_src/vstutils/default-auth-app/pages/PasswordReset.vue
new file mode 100644
index 00000000..28347276
--- /dev/null
+++ b/frontend_src/vstutils/default-auth-app/pages/PasswordReset.vue
@@ -0,0 +1,75 @@
+<template>
+    <form v-if="state === 'INITIAL' || state === 'LOADING'" @submit.prevent="submit">
+        <p>
+            {{
+                $t(
+                    'Forgot your password? Enter your email address below, and an email with instructions for setting a new one will be sent.',
+                )
+            }}
+        </p>
+        <FormGroup v-slot="{ classes, id }" label="Email" :errors="emailErrors">
+            <input :id="id" v-model="email" type="email" :class="classes" name="email" />
+        </FormGroup>
+        <button type="submit" class="btn btn-primary" :disabled="state === 'LOADING'">
+            {{ $t('Reset my Password') }}
+        </button>
+        <BackButton style="margin-top: 16px" />
+    </form>
+    <p v-else-if="state === 'ERROR'">
+        {{ $t('An error occurred. Please try again later.') }}
+    </p>
+    <p v-else-if="state === 'SUCCESS'">
+        {{
+            $t(
+                "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly.",
+            )
+        }}
+        <br />
+        {{
+            $t(
+                "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder.",
+            )
+        }}
+    </p>
+</template>
+
+<script setup lang="ts">
+    import { ref } from 'vue';
+    import FormGroup from './../components/FormGroup.vue';
+    import { useInitAppConfig, useTranslationsManager } from '../helpers';
+    import BackButton from '../components/BackButton.vue';
+
+    const config = useInitAppConfig();
+    const { i18n } = useTranslationsManager();
+    const state = ref<'INITIAL' | 'LOADING' | 'ERROR' | 'SUCCESS'>('INITIAL');
+    const email = ref('');
+    const emailErrors = ref<string[]>([]);
+
+    async function submit() {
+        state.value = 'LOADING';
+        try {
+            const url = new URL('oauth2/password_reset/', config.api.url);
+            url.search = new URLSearchParams({ lang: i18n.locale }).toString();
+            const response = await fetch(url, {
+                method: 'POST',
+                body: JSON.stringify({ email: email.value }),
+                headers: { 'Content-Type': 'application/json' },
+            });
+            if (!response.ok) {
+                if (response.status === 400) {
+                    const data = await response.json();
+                    if (data.email) {
+                        emailErrors.value = data.email;
+
+                        state.value = 'INITIAL';
+                        return;
+                    }
+                }
+                throw new Error('Invalid response');
+            }
+            state.value = 'SUCCESS';
+        } catch (error) {
+            state.value = 'ERROR';
+        }
+    }
+</script>
diff --git a/frontend_src/vstutils/default-auth-app/pages/PasswordResetConfirm.vue b/frontend_src/vstutils/default-auth-app/pages/PasswordResetConfirm.vue
new file mode 100644
index 00000000..96265e43
--- /dev/null
+++ b/frontend_src/vstutils/default-auth-app/pages/PasswordResetConfirm.vue
@@ -0,0 +1,87 @@
+<template>
+    <form @submit.prevent="submit">
+        <p>
+            {{ $t('Please enter your new password twice so we can verify you typed it in correctly.') }}
+        </p>
+        <FormGroup v-slot="{ classes, id }" :label="`${$t('New password')}`" :errors="passwordErrors">
+            <input :id="id" v-model="password" type="password" :class="classes" name="password" />
+        </FormGroup>
+        <FormGroup v-slot="{ classes, id }" :label="`${$t('Confirm password')}`">
+            <input
+                :id="id"
+                ref="password2El"
+                v-model="password2"
+                type="password"
+                :class="classes"
+                name="password2"
+            />
+        </FormGroup>
+        <div v-if="error" class="alert alert-danger" role="alert">
+            {{ $t(error) }}
+        </div>
+        <button type="submit" class="btn btn-primary" :disabled="isLoading">
+            {{ $t('Change my Password') }}
+        </button>
+    </form>
+</template>
+
+<script setup lang="ts">
+    import { onMounted, ref, watchEffect } from 'vue';
+    import { useRoute, useRouter } from 'vue-router/composables';
+    import FormGroup from './../components/FormGroup.vue';
+    import { useInitAppConfig, useTranslationsManager } from '../helpers';
+
+    const router = useRouter();
+    const route = useRoute();
+    const config = useInitAppConfig();
+    const { i18n } = useTranslationsManager();
+    const isLoading = ref(false);
+    const password = ref('');
+    const password2 = ref('');
+    const password2El = ref<HTMLInputElement>();
+    const error = ref('');
+    const passwordErrors = ref<string[]>([]);
+
+    onMounted(() => {
+        watchEffect(() => {
+            if (password.value !== password2.value) {
+                password2El.value?.setCustomValidity(`${i18n.t('Passwords do not match.')}`);
+            } else {
+                password2El.value?.setCustomValidity('');
+            }
+        });
+    });
+
+    async function submit() {
+        isLoading.value = true;
+        try {
+            const url = new URL('oauth2/password_reset_confirm/', config.api.url);
+            url.search = new URLSearchParams({ lang: i18n.locale }).toString();
+            const response = await fetch(url, {
+                method: 'POST',
+                body: JSON.stringify({
+                    uid: route.params.uid,
+                    token: route.params.token,
+                    password: password.value,
+                }),
+                headers: { 'Content-Type': 'application/json' },
+            });
+            if (!response.ok) {
+                const data = await response.json();
+                if (data.password) {
+                    passwordErrors.value = data.password;
+                } else if (data.uid || data.token) {
+                    error.value = 'Invalid link. Please request a new one.';
+                } else {
+                    throw new Error('Invalid response');
+                }
+                return;
+            }
+            router.push({ name: 'login', replace: true });
+        } catch {
+            error.value = 'An error occurred. Please try again later.';
+        } finally {
+            isLoading.value = false;
+        }
+    }
+</script>
diff --git a/frontend_src/vstutils/default-auth-app/pages/Registration.vue b/frontend_src/vstutils/default-auth-app/pages/Registration.vue
new file mode 100644
index 00000000..a2a9fe83
--- /dev/null
+++ b/frontend_src/vstutils/default-auth-app/pages/Registration.vue
@@ -0,0 +1,122 @@
+<template>
+    <div v-if="emailConfirmationRequired" style="gap: 10px; display: flex; flex-direction: column">
+        {{ $t('You have successfully registered. Please check your email for a confirmation link.') }}
+        <router-link
+            :to="{ name: 'login' }"
+            style="text-transform: capitalize"
+            class="btn btn-primary btn-block"
+            >{{ $t('login') }}</router-link
+        >
+    </div>
+    <form v-else ref="formEl" @submit.prevent="register">
+        <FormGroup v-slot="{ classes, id }" label="Username" :errors="errors.username">
+            <input
+                :id="id"
+                autocomplete="username"
+                autofocus
+                :class="classes"
+                name="username"
+                required
+                type="text"
+            />
+        </FormGroup>
+        <FormGroup v-slot="{ classes, id }" label="Email" :errors="errors.email">
+            <input :id="id" autocomplete="email" :class="classes" name="email" required type="text" />
+        </FormGroup>
+        <FormGroup v-slot="{ classes, id }" label="Password" :errors="errors.password">
+            <input
+                :id="id"
+                v-model="password1"
+                autocomplete="new-password"
+                :class="classes"
+                name="password"
+                required
+                type="password"
+            />
+        </FormGroup>
+        <FormGroup v-slot="{ classes, id }" label="Repeat password" :errors="errors.password2">
+            <input
+                :id="id"
+                ref="password2El"
+                v-model="password2"
+                autocomplete="new-password"
+                :class="classes"
+                name="password2"
+                type="password"
+                required
+            />
+        </FormGroup>
+        <div v-for="(error, idx) in nonFieldsErrors" :key="idx" class="alert alert-danger" role="alert">
+            {{ $t(error) }}
+        </div>
+        <button class="btn btn-primary btn-block" style="text-transform: capitalize">
+            {{ $t('register') }}
+        </button>
+        <BackButton />
+    </form>
+</template>
+
+<script setup lang="ts">
+    import { onMounted, ref, watchEffect } from 'vue';
+    import { useRouter } from 'vue-router/composables';
+    import { useInitAppConfig, useTranslationsManager } from './../helpers';
+    import FormGroup from './../components/FormGroup.vue';
+    import BackButton from './../components/BackButton.vue';
+
+    const router = useRouter();
+    const { i18n } = useTranslationsManager();
+    const config = useInitAppConfig();
+    const formEl = ref<HTMLFormElement>();
+    const password2El = ref<HTMLInputElement>();
+    const password1 = ref('');
+    const password2 = ref('');
+    const errors = ref<Record<string, string[]>>({});
+    const nonFieldsErrors = ref<string[]>([]);
+    const emailConfirmationRequired = ref(false);
+
+    onMounted(() => {
+        watchEffect(() => {
+            password2El.value?.setCustomValidity(
+                password1.value !== password2.value ? (i18n.t('Passwords do not match.') as string) : '',
+            );
+        });
+    });
+
+    async function register() {
+        const form = formEl.value;
+        if (!form) {
+            return;
+        }
+        try {
+            const url = new URL(`oauth2/registration/`, config.api.url);
+            url.search = new URLSearchParams({ lang: i18n.locale }).toString();
+            const response = await fetch(url, {
+                method: 'POST',
+                body: JSON.stringify(Object.fromEntries(new FormData(form).entries())),
+                headers: { 'Content-Type': 'application/json' },
+            });
+            const data = await response.json();
+            errors.value = {};
+            nonFieldsErrors.value = [];
+            if (response.ok) {
+                if (data.email_confirmation_required) {
+                    emailConfirmationRequired.value = true;
+                } else {
+                    router.push({ name: 'login' });
+                }
+            } else {
+                if (response.status === 400) {
+                    errors.value = data;
+                    if (data.detail) {
+                        nonFieldsErrors.value = [data.detail];
+                    }
+                } else {
+                    nonFieldsErrors.value = ['An error occurred. Please try again later.'];
+                }
+            }
+        } catch (error) {
+            errors.value = {};
+            nonFieldsErrors.value = ['An error occurred. Please try again later.'];
+        }
+    }
+</script>
diff --git a/frontend_src/vstutils/default-auth-app/pages/RegistrationConfirmEmail.vue b/frontend_src/vstutils/default-auth-app/pages/RegistrationConfirmEmail.vue
new file mode 100644
index 00000000..dded9aa0
--- /dev/null
+++ b/frontend_src/vstutils/default-auth-app/pages/RegistrationConfirmEmail.vue
@@ -0,0 +1,45 @@
+<template>
+    <div style="aspect-ratio: 1; display: flex; justify-content: center; align-items: center">
+        <p v-if="error" style="text-align: center">
+            {{ $t(error) }}
+        </p>
+        <Spinner v-else />
+    </div>
+</template>
+
+<script setup lang="ts">
+    import { ref } from 'vue';
+    import { useRoute, useRouter } from 'vue-router/composables';
+    import { useTranslationsManager, useInitAppConfig } from './../helpers';
+    import Spinner from '@/vstutils/components/Spinner.vue';
+
+    const router = useRouter();
+    const route = useRoute();
+    const translationsManager = useTranslationsManager();
+    const config = useInitAppConfig();
+    const code = route.params.code;
+    const error = ref('');
+
+    (async () => {
+        try {
+            const url = new URL('oauth2/confirm_email/', config.api.url);
+            url.search = new URLSearchParams({ lang: translationsManager.i18n.locale }).toString();
+            const response = await fetch(url, {
+                method: 'POST',
+                body: JSON.stringify({ code }),
+                headers: { 'Content-Type': 'application/json' },
+            });
+            if (!response.ok) {
+                if (response.status === 400) {
+                    error.value = 'Confirmation link is invalid or expired.';
+                } else {
+                    error.value = 'An error occurred. Please try again later.';
+                }
+                return;
+            }
+            router.push({ name: 'login' });
+        } catch (e) {
+            error.value = 'An error occurred. Please try again later.';
+        }
+    })();
+</script>
diff --git a/frontend_src/vstutils/default-page-loader.ts b/frontend_src/vstutils/default-page-loader.ts
new file mode 100644
index 00000000..5b7f47a9
--- /dev/null
+++ b/frontend_src/vstutils/default-page-loader.ts
@@ -0,0 +1,42 @@
+import { createApp, ref, defineComponent, h } from 'vue-demi';
+import Spinner from './components/Spinner.vue';
+
+export function createDefaultPageLoader() {
+    const show = ref(false);
+    const app = createApp(
+        defineComponent({
+            setup() {
+                return () =>
+                    show.value
+                        ? h(
+                              'div',
+                              {
+                                  staticStyle: {
+                                      position: 'absolute',
+                                      top: '0',
+                                      left: '0',
+                                      display: 'flex',
+                                      'justify-content': 'center',
+                                      'align-items': 'center',
+                                      width: '100vw',
+                                      height: '100vh',
+                                  },
+                              },
+                              [h(Spinner)],
+                          )
+                        : undefined;
+            },
+        }),
+    );
+    const div = document.createElement('div');
+    document.body.insertAdjacentElement('beforeend', div);
+    app.mount(div);
+    return {
+        show() {
+            show.value = true;
+        },
+        hide() {
+            show.value = false;
+        },
+    };
+}
diff --git a/frontend_src/vstutils/fetch-values.ts b/frontend_src/vstutils/fetch-values.ts
index 5a221960..6671dfc6 100644
--- a/frontend_src/vstutils/fetch-values.ts
+++ b/frontend_src/vstutils/fetch-values.ts
@@ -1,7 +1,6 @@
 import { i18n } from '@/vstutils/translation';
 import { AggregatedQueriesExecutor } from '@/vstutils/AggregatedQueriesExecutor';
-import { RequestTypes, createPropertyProxy, getApp } from '@/vstutils/utils';
-import { FKField } from '@/vstutils/fields/fk/fk/FKField';
+import { OBJECT_NOT_FOUND_TEXT, RequestTypes, createPropertyProxy, getApp } from '@/vstutils/utils';
 import { ArrayField } from '@/vstutils/fields/array/ArrayField';
 import { DynamicField } from '@/vstutils/fields/dynamic';
 
@@ -67,7 +66,7 @@ export function fetchPKs(
                 const model = qs!.getResponseModelClass(RequestTypes.LIST);
                 const notFound = new model({
                     [field.valueField]: pk,
-                    [field.viewField]: i18n.t(FKField.NOT_FOUND_TEXT),
+                    [field.viewField]: i18n.t(OBJECT_NOT_FOUND_TEXT),
                 } as InnerData);
                 notFound.__notFound = true;
                 return notFound;
diff --git a/frontend_src/vstutils/fields/FieldsResolver.ts b/frontend_src/vstutils/fields/FieldsResolver.ts
index 96c1e7a5..5a9911e4 100644
--- a/frontend_src/vstutils/fields/FieldsResolver.ts
+++ b/frontend_src/vstutils/fields/FieldsResolver.ts
@@ -1,7 +1,7 @@
 import type { Field, FieldOptions, FieldXOptions } from './base';
 import { BaseField } from './base';
 import { ENUM_TYPES, hasOwnProp, SCHEMA_DATA_TYPE, SCHEMA_DATA_TYPE_VALUES } from '../utils';
-import type { AppSchema } from '../AppConfiguration';
+import type { AppSchema } from '../schema';
 import type { ParameterType } from 'swagger-schema-official';
 
 const X_FORMAT = 'x-format';
diff --git a/frontend_src/vstutils/fields/__tests__/FieldsResolver.test.js b/frontend_src/vstutils/fields/__tests__/FieldsResolver.test.js
index da7ae3c0..7fc4f27e 100644
--- a/frontend_src/vstutils/fields/__tests__/FieldsResolver.test.js
+++ b/frontend_src/vstutils/fields/__tests__/FieldsResolver.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe, beforeAll } from '@jest/globals';
 import * as files from '../files';
 import { FieldsResolver } from '../FieldsResolver.ts';
 import { addDefaultFields } from '../index.ts';
diff --git a/frontend_src/vstutils/fields/__tests__/MultipleNamedBinFileField.test.js b/frontend_src/vstutils/fields/__tests__/MultipleNamedBinFileField.test.js
index 45715a91..2711fac0 100644
--- a/frontend_src/vstutils/fields/__tests__/MultipleNamedBinFileField.test.js
+++ b/frontend_src/vstutils/fields/__tests__/MultipleNamedBinFileField.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe } from '@jest/globals';
 import MultipleNamedBinFileField from '../files/multiple-named-binary-file/MultipleNamedBinaryFileField';
 
 describe('MultipleNamedBinFileField', () => {
diff --git a/frontend_src/vstutils/fields/__tests__/fields-container-classes.test.ts b/frontend_src/vstutils/fields/__tests__/fields-container-classes.test.ts
index 8321344f..9e95dee3 100644
--- a/frontend_src/vstutils/fields/__tests__/fields-container-classes.test.ts
+++ b/frontend_src/vstutils/fields/__tests__/fields-container-classes.test.ts
@@ -1,4 +1,3 @@
-import { expect, test } from '@jest/globals';
 import { createApp, createSchema } from '@/unittests';
 import { useEntityViewClasses } from '@/vstutils/store';
 import { ref } from 'vue';
diff --git a/frontend_src/vstutils/fields/__tests__/fields-types.test.ts b/frontend_src/vstutils/fields/__tests__/fields-types.test.ts
index 380c7958..72d21ac1 100644
--- a/frontend_src/vstutils/fields/__tests__/fields-types.test.ts
+++ b/frontend_src/vstutils/fields/__tests__/fields-types.test.ts
@@ -1,4 +1,3 @@
-import { test, describe, expect } from '@jest/globals';
 import StringField from '../text/StringField';
 import { FKField } from '../fk/fk/FKField';
 
diff --git a/frontend_src/vstutils/fields/__tests__/nested-object.test.js b/frontend_src/vstutils/fields/__tests__/nested-object.test.js
index 75bd8d7f..b473aa96 100644
--- a/frontend_src/vstutils/fields/__tests__/nested-object.test.js
+++ b/frontend_src/vstutils/fields/__tests__/nested-object.test.js
@@ -1,5 +1,4 @@
-import { expect, test, describe, beforeAll } from '@jest/globals';
-import { createApp } from '../../../unittests/create-app.js';
+import { createApp } from '../../../unittests/create-app.ts';
 
 describe('NestedObject field', () => {
     let app;
diff --git a/frontend_src/vstutils/fields/autocomplete/AutocompleteFieldContentEditMixin.vue b/frontend_src/vstutils/fields/autocomplete/AutocompleteFieldContentEditMixin.vue
index 4a005041..5bd6d237 100644
--- a/frontend_src/vstutils/fields/autocomplete/AutocompleteFieldContentEditMixin.vue
+++ b/frontend_src/vstutils/fields/autocomplete/AutocompleteFieldContentEditMixin.vue
@@ -20,7 +20,7 @@
 
 <script>
     import $ from 'jquery';
-    import autoComplete from 'JavaScript-autoComplete/auto-complete';
+    import autoComplete from '@/libs/auto-complete.js';
     import { escapeHtml } from '../../utils';
     import { BaseFieldContentEdit } from '../base';
 
diff --git a/frontend_src/vstutils/fields/autocomplete/composables.ts b/frontend_src/vstutils/fields/autocomplete/composables.ts
index df2816a9..5d7b783b 100644
--- a/frontend_src/vstutils/fields/autocomplete/composables.ts
+++ b/frontend_src/vstutils/fields/autocomplete/composables.ts
@@ -1,7 +1,6 @@
 import type { Ref } from 'vue';
 import { onMounted } from 'vue';
-// @ts-expect-error JavaScript-autoComplete has no types
-import autoComplete from 'JavaScript-autoComplete/auto-complete';
+import autoComplete from '@/libs/auto-complete.js';
 
 interface AutocompleteDropdownParams<T> {
     element: Ref<HTMLInputElement | null>;
diff --git a/frontend_src/vstutils/fields/barcode/QRCodeField.ts b/frontend_src/vstutils/fields/barcode/QRCodeField.ts
index 6583c4a9..4dad6eda 100644
--- a/frontend_src/vstutils/fields/barcode/QRCodeField.ts
+++ b/frontend_src/vstutils/fields/barcode/QRCodeField.ts
@@ -3,9 +3,9 @@ import { defineComponent, h, ref } from 'vue';
 import type { FieldReadonlyPropsDefType } from '@/vstutils/fields/base';
 import { BaseField, BaseFieldMixin, FieldReadonlyPropsDef } from '@/vstutils/fields/base';
 import { Html5QrcodeSupportedFormats } from 'html5-qrcode';
+import { getApp } from '@/vstutils/utils';
 import type { BarcodeFieldXOptions, BarcodeField } from './base';
 import BarcodeFieldContentEdit from './BarcodeFieldContentEdit.vue';
-import { getApp } from '@/spa';
 import CanvasRenderer from './CanvasRenderer.vue';
 import FullScreenView from '@/vstutils/components/FullScreenView.vue';
 
diff --git a/frontend_src/vstutils/fields/barcode/__tests__/barcode-fields.test.ts b/frontend_src/vstutils/fields/barcode/__tests__/barcode-fields.test.ts
index aaf808eb..0065dda9 100644
--- a/frontend_src/vstutils/fields/barcode/__tests__/barcode-fields.test.ts
+++ b/frontend_src/vstutils/fields/barcode/__tests__/barcode-fields.test.ts
@@ -1,7 +1,4 @@
-import { expect, test, describe, beforeAll, beforeEach } from '@jest/globals';
-import fetchMock from 'jest-fetch-mock';
-import { setupJestCanvasMock } from 'jest-canvas-mock';
-import { createApp, createSchema, mountApp, openPage, useTestCtx, waitForPageLoading } from '@/unittests';
+import { createApp, createSchema, useTestCtx, waitForPageLoading } from '@/unittests';
 import schema from './fields-schema.json';
 import type { BaseModel } from '@/vstutils/models';
 import { QRCodeField } from '../QRCodeField';
@@ -147,19 +144,15 @@ describe('Barcode fields', () => {
     let instance: BaseModel;
 
     beforeAll(async () => {
-        fetchMock.enableMocks();
-        setupJestCanvasMock();
         // @ts-expect-error it works on my pc really
         await createApp({ schema: createSchema(schema) });
-        await mountApp();
         const { app } = useTestCtx();
         SomeModel = app.modelsResolver.byReferencePath('#/definitions/SomeModel');
         instance = new SomeModel();
     });
 
-    beforeEach(async () => {
+    beforeEach(() => {
         fetchMock.resetMocks();
-        await openPage('/');
     });
 
     test('resolving', () => {
diff --git a/frontend_src/vstutils/fields/base/BaseField.ts b/frontend_src/vstutils/fields/base/BaseField.ts
index 2f8c40ff..ac959646 100644
--- a/frontend_src/vstutils/fields/base/BaseField.ts
+++ b/frontend_src/vstutils/fields/base/BaseField.ts
@@ -1,125 +1,26 @@
-import type { Schema, ParameterType, ParameterCollectionFormat } from 'swagger-schema-official';
+import type { ParameterType } from 'swagger-schema-official';
 import { defineComponent, markRaw, toRaw } from 'vue';
 import type { InnerData, RepresentData } from '../../utils';
-import { _translate, capitalize, deepEqual, nameToTitle, X_OPTIONS, stringToCssClass } from '../../utils';
+import { _translate, deepEqual, X_OPTIONS, stringToCssClass, nameToTitle, capitalize } from '../../utils';
 import { pop_up_msg } from '../../popUp';
-import type { Model, ModelConstructor } from '../../models';
+import type { ModelConstructor } from '../../models';
 import BaseFieldMixin from './BaseFieldMixin.vue';
 import { i18n } from '../../translation';
 import type { IApp } from '@/vstutils/app';
 import type { Component } from 'vue';
 import { BaseFieldLabel } from '@/vstutils/fields/base';
+import type {
+    DefaultXOptions,
+    Field,
+    FieldMixin,
+    FieldOptions,
+    ModelPropertyDescriptor,
+    RedirectOptions,
+} from './Field';
 
-const componentsCache = new WeakMap<FieldConstructor, Component>();
-
-interface ModelPropertyDescriptor<Represent> extends PropertyDescriptor {
-    get(this: Model): Represent | null | undefined;
-    set(this: Model, value: Represent | null | undefined): void;
-}
-
-interface RedirectOptions {
-    operation_name?: string;
-    depend_field?: string;
-    concat_field_name?: boolean;
-}
-
-export interface FieldXOptions {
-    prependText?: string;
-    appendText?: string;
-    redirect?: RedirectOptions;
-    translateFieldName?: string;
-    disableLabelTranslation?: boolean;
-    [key: string]: unknown;
-}
-
-export type DefaultXOptions = FieldXOptions | undefined;
-
-export type FieldOptions<XOptions extends DefaultXOptions, Inner> = Omit<Schema, 'default' | 'items'> & {
-    allowEmptyValue?: boolean;
-    collectionFormat?: ParameterCollectionFormat;
-    default?: Inner;
-    hidden?: boolean;
-    items?: FieldOptions<DefaultXOptions, unknown>;
-    name: string;
-    required?: boolean;
-    title?: string;
-    'x-collectionFormat'?: ParameterCollectionFormat;
-    'x-format'?: string;
-    'x-hidden'?: boolean;
-    'x-nullable'?: boolean;
-    'x-validators'?: {
-        extensions?: string[];
-        min_width?: number;
-        max_width?: number;
-        min_height?: number;
-        max_height?: number;
-    };
-} & (XOptions extends undefined ? { 'x-options'?: XOptions } : { 'x-options': XOptions });
-
-export interface Field<
-    Inner = unknown,
-    Represent = unknown,
-    XOptions extends DefaultXOptions = DefaultXOptions,
-> {
-    options: FieldOptions<XOptions, Inner>;
-    props: XOptions;
-
-    type: ParameterType;
-    format?: string;
-
-    name: string;
-    title: string;
-    required: boolean;
-    readOnly: boolean;
-    nullable: boolean;
-    description?: string;
-    hidden: boolean;
+export * from './Field';
 
-    hasDefault: boolean;
-    default?: Inner;
-
-    prependText?: string;
-    appendText?: string;
-
-    redirect?: RedirectOptions;
-
-    model?: ModelConstructor;
-
-    translateFieldName: string;
-    disableLabelTranslation: boolean;
-    fkLinkable: boolean;
-
-    getComponent(): Component;
-    getLabelComponent(): Component;
-    getArrayComponent(): Component | undefined;
-
-    toInner(data: RepresentData): Inner | null | undefined;
-    toRepresent(data: InnerData): Represent | null | undefined;
-
-    validateValue(data: RepresentData): Represent | null | undefined;
-    validateInner(data: InnerData): void;
-    translateValue(value: Represent): Represent;
-
-    getValue(data?: InnerData): Inner | null | undefined;
-    getValue(data?: RepresentData): Represent | null | undefined;
-
-    prepareFieldForView(path: string): void;
-
-    getInitialValue(args?: { requireValue: boolean }): Inner | undefined | null;
-    getEmptyValue(): Inner | undefined | null;
-
-    toDescriptor(): ModelPropertyDescriptor<Represent>;
-
-    isEqual(other: Field<any, any, any>): boolean;
-
-    isSameValues(data1: RepresentData, data2: RepresentData): boolean;
-
-    parseFieldError(errorData: unknown, instanceData: InnerData): unknown;
-
-    getContainerCssClasses(data: RepresentData): string[] | undefined;
-}
-
-export type FieldMixin = Component;
+const componentsCache = new WeakMap<FieldConstructor, Component>();
 
 export class BaseField<Inner, Represent, XOptions extends DefaultXOptions = DefaultXOptions>
     implements Field<Inner, Represent, XOptions>
diff --git a/frontend_src/vstutils/fields/base/Field.ts b/frontend_src/vstutils/fields/base/Field.ts
new file mode 100644
index 00000000..ddceb06d
--- /dev/null
+++ b/frontend_src/vstutils/fields/base/Field.ts
@@ -0,0 +1,113 @@
+import type { ModelConstructor, Model } from '@/vstutils/models/Model';
+import type { RepresentData, InnerData } from '@/vstutils/utils';
+import type { Schema, ParameterCollectionFormat, ParameterType } from 'swagger-schema-official';
+import type { Component } from 'vue';
+
+export interface ModelPropertyDescriptor<Represent> extends PropertyDescriptor {
+    get(this: Model): Represent | null | undefined;
+    set(this: Model, value: Represent | null | undefined): void;
+}
+
+export interface RedirectOptions {
+    operation_name?: string;
+    depend_field?: string;
+    concat_field_name?: boolean;
+}
+
+export interface FieldXOptions {
+    prependText?: string;
+    appendText?: string;
+    redirect?: RedirectOptions;
+    translateFieldName?: string;
+    disableLabelTranslation?: boolean;
+    [key: string]: unknown;
+}
+
+export type DefaultXOptions = FieldXOptions | undefined;
+
+export type FieldOptions<XOptions extends DefaultXOptions, Inner> = Omit<Schema, 'default' | 'items'> & {
+    allowEmptyValue?: boolean;
+    collectionFormat?: ParameterCollectionFormat;
+    default?: Inner;
+    hidden?: boolean;
+    items?: FieldOptions<DefaultXOptions, unknown>;
+    name: string;
+    required?: boolean;
+    title?: string;
+    'x-collectionFormat'?: ParameterCollectionFormat;
+    'x-format'?: string;
+    'x-hidden'?: boolean;
+    'x-nullable'?: boolean;
+    'x-validators'?: {
+        extensions?: string[];
+        min_width?: number;
+        max_width?: number;
+        min_height?: number;
+        max_height?: number;
+    };
+} & (XOptions extends undefined ? { 'x-options'?: XOptions } : { 'x-options': XOptions });
+
+export interface Field<
+    Inner = unknown,
+    Represent = unknown,
+    XOptions extends DefaultXOptions = DefaultXOptions,
+> {
+    options: FieldOptions<XOptions, Inner>;
+    props: XOptions;
+
+    type: ParameterType;
+    format?: string;
+
+    name: string;
+    title: string;
+    required: boolean;
+    readOnly: boolean;
+    nullable: boolean;
+    description?: string;
+    hidden: boolean;
+
+    hasDefault: boolean;
+    default?: Inner;
+
+    prependText?: string;
+    appendText?: string;
+
+    redirect?: RedirectOptions;
+
+    model?: ModelConstructor;
+
+    translateFieldName: string;
+    disableLabelTranslation: boolean;
+    fkLinkable: boolean;
+
+    getComponent(): Component;
+    getLabelComponent(): Component;
+    getArrayComponent(): Component | undefined;
+
+    toInner(data: RepresentData): Inner | null | undefined;
+    toRepresent(data: InnerData): Represent | null | undefined;
+
+    validateValue(data: RepresentData): Represent | null | undefined;
+    validateInner(data: InnerData): void;
+    translateValue(value: Represent): Represent;
+
+    getValue(data?: InnerData): Inner | null | undefined;
+    getValue(data?: RepresentData): Represent | null | undefined;
+
+    prepareFieldForView(path: string): void;
+
+    getInitialValue(args?: { requireValue: boolean }): Inner | undefined | null;
+    getEmptyValue(): Inner | undefined | null;
+
+    toDescriptor(): ModelPropertyDescriptor<Represent>;
+
+    isEqual(other: Field<any, any, any>): boolean;
+
+    isSameValues(data1: RepresentData, data2: RepresentData): boolean;
+
+    parseFieldError(errorData: unknown, instanceData: InnerData): unknown;
+
+    getContainerCssClasses(data: RepresentData): string[] | undefined;
+}
+
+export type FieldMixin = Component;
diff --git a/frontend_src/vstutils/fields/boolean/__tests__/BooleanField.test.js b/frontend_src/vstutils/fields/boolean/__tests__/BooleanField.test.js
index 791cf036..81484ed8 100644
--- a/frontend_src/vstutils/fields/boolean/__tests__/BooleanField.test.js
+++ b/frontend_src/vstutils/fields/boolean/__tests__/BooleanField.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe } from '@jest/globals';
 import { BooleanField } from '../../boolean';
 
 describe('BooleanField', () => {
diff --git a/frontend_src/vstutils/fields/choices/__tests__/ordering-choices.test.ts b/frontend_src/vstutils/fields/choices/__tests__/ordering-choices.test.ts
index 3de74f65..a59cf35f 100644
--- a/frontend_src/vstutils/fields/choices/__tests__/ordering-choices.test.ts
+++ b/frontend_src/vstutils/fields/choices/__tests__/ordering-choices.test.ts
@@ -1,4 +1,3 @@
-import { test, describe, expect } from '@jest/globals';
 import OrderingChoicesField from '../OrderingChoicesField';
 
 describe('OrderingChoicesField', () => {
diff --git a/frontend_src/vstutils/fields/datetime/__tests__/DateField.test.js b/frontend_src/vstutils/fields/datetime/__tests__/DateField.test.js
index 64c221f4..4c91a606 100644
--- a/frontend_src/vstutils/fields/datetime/__tests__/DateField.test.js
+++ b/frontend_src/vstutils/fields/datetime/__tests__/DateField.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe } from '@jest/globals';
 import DateField from '../DateField';
 
 describe('DateField', () => {
diff --git a/frontend_src/vstutils/fields/datetime/__tests__/DateTimeField.test.js b/frontend_src/vstutils/fields/datetime/__tests__/DateTimeField.test.js
index 44efabf0..d298ef4a 100644
--- a/frontend_src/vstutils/fields/datetime/__tests__/DateTimeField.test.js
+++ b/frontend_src/vstutils/fields/datetime/__tests__/DateTimeField.test.js
@@ -1,8 +1,7 @@
-import { expect, test, describe, beforeAll } from '@jest/globals';
 import { DateTimeField } from '../index';
 import { mount } from '@vue/test-utils';
 import moment from 'moment-timezone';
-import { createApp } from '@/unittests/create-app.js';
+import { createApp } from '@/unittests/create-app.ts';
 import VueI18n from 'vue-i18n';
 
 let app;
@@ -66,7 +65,6 @@ describe('DateTimeField', () => {
             { localVue: app.vue, i18n: new VueI18n() },
         );
 
-        const contentLines = wrapper.element.textContent.split('\n');
-        expect(contentLines[1].trim()).toBe('Tuesday, November 1st 2022, 9:30:26 am');
+        expect(wrapper.element.textContent).toContain('Tuesday, November 1st 2022, 9:30:26 am');
     });
 });
diff --git a/frontend_src/vstutils/fields/datetime/__tests__/TimeIntervalField.test.js b/frontend_src/vstutils/fields/datetime/__tests__/TimeIntervalField.test.js
index 15b1ab4d..bab58c20 100644
--- a/frontend_src/vstutils/fields/datetime/__tests__/TimeIntervalField.test.js
+++ b/frontend_src/vstutils/fields/datetime/__tests__/TimeIntervalField.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe } from '@jest/globals';
 import TimeIntervalField from '../TimeIntervalField';
 
 describe('TimeIntervalField', () => {
diff --git a/frontend_src/vstutils/fields/dynamic/__tests__/DependFromFkField.test.js b/frontend_src/vstutils/fields/dynamic/__tests__/DependFromFkField.test.js
index cc8fa2f9..fd6026b1 100644
--- a/frontend_src/vstutils/fields/dynamic/__tests__/DependFromFkField.test.js
+++ b/frontend_src/vstutils/fields/dynamic/__tests__/DependFromFkField.test.js
@@ -1,6 +1,11 @@
-import { describe, expect, test, beforeAll, beforeEach } from '@jest/globals';
-import { createApp, createSchema, schemaListOf, mountApp, waitForPageLoading, openPage } from '@/unittests';
-import fetchMock from 'jest-fetch-mock';
+import {
+    createApp,
+    createSchema,
+    schemaListOf,
+    waitForPageLoading,
+    openPage,
+    expectRequest,
+} from '@/unittests';
 
 const schema = createSchema({
     paths: {
@@ -110,8 +115,6 @@ describe('DependFromFkField', () => {
 
     beforeAll(async () => {
         app = await createApp({ schema });
-        await mountApp();
-        fetchMock.enableMocks();
     });
 
     beforeEach(async () => {
@@ -165,7 +168,7 @@ describe('DependFromFkField', () => {
 
         expect(fetchMock).toBeCalledTimes(2);
         // page hit
-        expect(fetchMock.mock.calls[0][1]).toStrictEqual({
+        expectRequest(fetchMock.mock.calls[0][0], {
             method: 'put',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify([
@@ -176,7 +179,7 @@ describe('DependFromFkField', () => {
             ]),
         });
         // prefetch hit
-        expect(fetchMock.mock.calls[1][1]).toStrictEqual({
+        expectRequest(fetchMock.mock.calls[1][0], {
             method: 'put',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify([
diff --git a/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.js b/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.js
index 963334c6..cc2485c4 100644
--- a/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.js
+++ b/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.js
@@ -1,4 +1,3 @@
-import { beforeAll, describe, expect, test } from '@jest/globals';
 import { createApp } from '@/unittests/create-app';
 import { BooleanField } from '@/vstutils/fields/boolean';
 import { ChoicesField } from '@/vstutils/fields/choices';
diff --git a/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.ts b/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.ts
index fd8d34d2..e2dc7934 100644
--- a/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.ts
+++ b/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.ts
@@ -1,4 +1,3 @@
-import { beforeAll, describe, expect, test, jest } from '@jest/globals';
 import { StringField } from '@/vstutils/fields/text';
 import { DynamicField } from '../DynamicField';
 import { createApp } from '@/unittests';
@@ -32,7 +31,7 @@ describe('DynamicField', () => {
         };
 
         const data = reactive({ someField: 'val 1', field: 'initial value' });
-        const setValue = jest.fn();
+        const setValue = vitest.fn();
         const wrapper = mount(
             {
                 template: `<Field :field="field" :data="data" type="readonly" @set-value="setValue" />`,
diff --git a/frontend_src/vstutils/fields/dynamic/__tests__/depend-on-parent-view.test.js b/frontend_src/vstutils/fields/dynamic/__tests__/depend-on-parent-view.test.js
index 45e714c2..d96182ba 100644
--- a/frontend_src/vstutils/fields/dynamic/__tests__/depend-on-parent-view.test.js
+++ b/frontend_src/vstutils/fields/dynamic/__tests__/depend-on-parent-view.test.js
@@ -1,25 +1,12 @@
-import { beforeAll, expect, test } from '@jest/globals';
-import schema from './depend-on-parent-view-schema.json';
-import fetchMock from 'jest-fetch-mock';
-import { createApp } from '@/unittests/create-app';
-import { createSchema } from '@/unittests/schema';
+import { waitFor } from '@testing-library/dom';
+import { expectNthRequest, createApp, createSchema } from '@/unittests';
 import { PhoneField } from '@/vstutils/fields/text/phone';
 import { ColorField } from '@/vstutils/fields/color';
-
-beforeAll(() => {
-    fetchMock.enableMocks();
-});
+import schema from './depend-on-parent-view-schema.json';
 
 test('DynamicField depending on value from parent view', async () => {
     const app = await createApp({ schema: createSchema(schema) });
 
-    const view = app.views.get(
-        '/level_0/{level_0_with_value_for_dynamic_id}/level_1/{level_1_with_value_for_dynamic_id}/level_2/{level_2_id}/with_dynamic/',
-    );
-
-    await app.router.push('/level_0/0/level_1/1/level_2/2/with_dynamic/');
-    const store = view._createStore();
-
     fetchMock.mockResponseOnce(
         JSON.stringify([
             {
@@ -48,31 +35,38 @@ test('DynamicField depending on value from parent view', async () => {
             },
         ]),
     );
+    await app.router.push('/level_0/0/level_1/1/level_2/2/with_dynamic/');
+    await waitFor(() => expect(fetchMock.mock.calls.length).toBe(2));
 
-    await Promise.all([app.store.setPage(store), store.fetchData()]);
-
-    expect(fetchMock.mock.calls.length).toBe(1);
-    const [, request] = fetchMock.mock.calls[0];
-    const body = JSON.parse(request.body);
-    expect(body).toStrictEqual([
-        {
-            method: 'get',
-            path: ['level_0', '0'],
-        },
-        {
-            method: 'get',
-            path: ['level_0', '0', 'level_1', '1'],
-        },
-        {
-            method: 'get',
-            path: ['level_0', '0', 'level_1', '1', 'level_2', '2'],
-        },
-        {
-            method: 'get',
-            path: ['level_0', '0', 'level_1', '1', 'level_2', '2', 'with_dynamic'],
-            query: 'limit=20&offset=0',
-        },
-    ]);
+    expectNthRequest(0, {
+        method: 'PUT',
+        url: 'http://localhost/api/endpoint/',
+        body: [
+            {
+                method: 'get',
+                path: ['level_0', '0'],
+            },
+            {
+                method: 'get',
+                path: ['level_0', '0', 'level_1', '1'],
+            },
+            {
+                method: 'get',
+                path: ['level_0', '0', 'level_1', '1', 'level_2', '2'],
+            },
+        ],
+    });
+    expectNthRequest(1, {
+        method: 'PUT',
+        url: 'http://localhost/api/endpoint/',
+        body: [
+            {
+                method: 'get',
+                path: ['level_0', '0', 'level_1', '1', 'level_2', '2', 'with_dynamic'],
+                query: 'limit=20&offset=0',
+            },
+        ],
+    });
 
     const dynamicFromParent = app.modelsResolver.get('WithDynamic').fields.get('dynamic_from_parent');
     expect(dynamicFromParent.getRealField({})).toBeInstanceOf(ColorField);
diff --git a/frontend_src/vstutils/fields/files/__tests__/files.test.js b/frontend_src/vstutils/fields/files/__tests__/files.test.js
index 24edf4bb..8a86392c 100644
--- a/frontend_src/vstutils/fields/files/__tests__/files.test.js
+++ b/frontend_src/vstutils/fields/files/__tests__/files.test.js
@@ -1,4 +1,3 @@
-import { jest, test, beforeAll, expect } from '@jest/globals';
 import { createApp, mount } from '@/unittests';
 import { h } from 'vue';
 import { deferredPromise } from '@/vstutils/utils';
@@ -30,7 +29,7 @@ test('files renaming', async () => {
     });
 
     const { promise: setValuePromise, resolve } = deferredPromise();
-    const listener = jest.fn(() => resolve());
+    const listener = vitest.fn(() => resolve());
 
     const wrapper = mount({
         setup() {
diff --git a/frontend_src/vstutils/fields/files/__tests__/readfiles.test.js b/frontend_src/vstutils/fields/files/__tests__/readfiles.test.js
index 6b418846..b8bdc119 100644
--- a/frontend_src/vstutils/fields/files/__tests__/readfiles.test.js
+++ b/frontend_src/vstutils/fields/files/__tests__/readfiles.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe, jest } from '@jest/globals';
 import { useResolutionValidator } from '../named-binary-image/useResolutionValidator';
 import { NamedBinaryImageField } from '../named-binary-image';
 import { X_OPTIONS } from '../../../utils';
@@ -12,7 +11,7 @@ describe('File fields', () => {
             },
         });
 
-        const validatedCallback = jest.fn();
+        const validatedCallback = vitest.fn();
 
         const { readFiles } = useResolutionValidator(field, validatedCallback);
 
diff --git a/frontend_src/vstutils/fields/files/__tests__/useDradAndDrop.test.js b/frontend_src/vstutils/fields/files/__tests__/useDradAndDrop.test.js
index da4b9257..69534a43 100644
--- a/frontend_src/vstutils/fields/files/__tests__/useDradAndDrop.test.js
+++ b/frontend_src/vstutils/fields/files/__tests__/useDradAndDrop.test.js
@@ -1,12 +1,11 @@
-import { expect, test, jest } from '@jest/globals';
 import { ref, nextTick } from 'vue';
 import { mount } from '@vue/test-utils';
 import { useDragAndDrop } from '../useDragAndDrop';
 
 test('useDragAndDrop', async () => {
-    const onDragOver = jest.fn();
-    const onDragLeave = jest.fn();
-    const onDragFinished = jest.fn();
+    const onDragOver = vitest.fn();
+    const onDragLeave = vitest.fn();
+    const onDragFinished = vitest.fn();
 
     const wrapper = mount({
         template: '<div ref="div" />',
diff --git a/frontend_src/vstutils/fields/files/binary-file/BinaryFileFieldReadFileButton.js b/frontend_src/vstutils/fields/files/binary-file/BinaryFileFieldReadFileButton.js
index b60cabda..e3054ac4 100644
--- a/frontend_src/vstutils/fields/files/binary-file/BinaryFileFieldReadFileButton.js
+++ b/frontend_src/vstutils/fields/files/binary-file/BinaryFileFieldReadFileButton.js
@@ -1,4 +1,4 @@
-import FileFieldReadFileButton from '../file/FileFieldReadFileButton';
+import FileFieldReadFileButton from '../file/FileFieldReadFileButton.vue';
 
 export default {
     mixins: [FileFieldReadFileButton],
diff --git a/frontend_src/vstutils/fields/files/binary-file/__tests__/binary-file.test.js b/frontend_src/vstutils/fields/files/binary-file/__tests__/binary-file.test.js
index 4d85659c..415bf8eb 100644
--- a/frontend_src/vstutils/fields/files/binary-file/__tests__/binary-file.test.js
+++ b/frontend_src/vstutils/fields/files/binary-file/__tests__/binary-file.test.js
@@ -1,10 +1,9 @@
-import { describe, jest, test, expect } from '@jest/globals';
 import BinaryFileFieldReadFileButton from '../BinaryFileFieldReadFileButton';
 
 describe('BinaryFileField', () => {
     test('overloaded mixin', () => {
-        const this_ = { $emit: jest.fn() };
-        const eventData = { target: { files: jest.fn() } };
+        const this_ = { $emit: vitest.fn() };
+        const eventData = { target: { files: vitest.fn() } };
         BinaryFileFieldReadFileButton.methods.onChange.call(this_, eventData);
         expect(this_.$emit.mock.calls.length).toBe(1);
         expect(this_.$emit.mock.calls[0][0]).toBe('read-file');
diff --git a/frontend_src/vstutils/fields/files/csv-file/__tests__/csv-file.test.js b/frontend_src/vstutils/fields/files/csv-file/__tests__/csv-file.test.js
index 7b96d121..5ec5725d 100644
--- a/frontend_src/vstutils/fields/files/csv-file/__tests__/csv-file.test.js
+++ b/frontend_src/vstutils/fields/files/csv-file/__tests__/csv-file.test.js
@@ -1,4 +1,3 @@
-import { describe, test, expect, beforeAll } from '@jest/globals';
 import { CsvFileField } from '../index';
 import { getTableConfig } from '../DataTable.vue';
 import { createApp, createSchema } from '@/unittests';
@@ -70,7 +69,7 @@ describe('CSVFileFieldEdit', () => {
     });
 
     test('invalid file', () => {
-        guiPopUp.error = jest.fn();
+        guiPopUp.error = vitest.fn();
 
         expect(field.parseFile('"""')).toBeUndefined();
         expect(guiPopUp.error).toBeCalledTimes(1);
diff --git a/frontend_src/vstutils/fields/files/csv-file/index.ts b/frontend_src/vstutils/fields/files/csv-file/index.ts
index 3468d064..509ce1d9 100644
--- a/frontend_src/vstutils/fields/files/csv-file/index.ts
+++ b/frontend_src/vstutils/fields/files/csv-file/index.ts
@@ -13,10 +13,10 @@ import type { ParseConfig } from 'papaparse';
 import type { FieldOptions, FieldXOptions } from '@/vstutils/fields/base';
 import type { InnerData, RepresentData } from '@/vstutils/utils';
 import type { ModelConstructor } from '@/vstutils/models';
-import type { ModelDefinition } from '@/vstutils/AppConfiguration';
+import type { ModelDefinition } from '@/vstutils/schema';
 import type { IFileField } from '../file';
 import { guiPopUp } from '@/vstutils/popUp';
-import { i18n } from '@/app.common';
+import { i18n } from '@/vstutils/translation';
 
 export { CsvFileFieldEdit, CsvFileFieldReadonly };
 
diff --git a/frontend_src/vstutils/fields/files/multiple-named-binary-image/Carousel.vue b/frontend_src/vstutils/fields/files/multiple-named-binary-image/Carousel.vue
index 749a259b..5503fc84 100644
--- a/frontend_src/vstutils/fields/files/multiple-named-binary-image/Carousel.vue
+++ b/frontend_src/vstutils/fields/files/multiple-named-binary-image/Carousel.vue
@@ -1,52 +1,50 @@
 <template>
     <div class="container text-center my-3">
-        <splide ref="splideRef" :options="options" @splide:mounted="updateOptions">
-            <splide-slide
+        <swiper-container ref="swiperRef" :slides-per-view="slidesPerView">
+            <swiper-slide
                 v-for="(item, idx) in preparedItems"
                 :key="idx"
                 style="cursor: pointer"
-                @click.native="onClick(idx)"
+                class="slide"
+                @click="onClick(idx)"
             >
-                <div class="splide__container">
-                    <div class="splide__content" style="overflow: hidden">
-                        <span
-                            v-if="$listeners['remove-file']"
-                            class="fa fa-times btn-default remove-file"
-                            @click.stop="emit('remove-file', idx)"
-                        />
-                        <img
-                            :src="item.imgSrc"
-                            :alt="item.name ?? ''"
-                            style="margin: 4px auto 16px auto; width: 90%; height: auto"
-                        />
-                        <div class="item-title">
-                            {{ item.name }}
-                        </div>
+                <div class="content" style="overflow: hidden">
+                    <span
+                        v-if="$listeners['remove-file']"
+                        class="fa fa-times btn-default remove-file"
+                        @click.stop="emit('remove-file', idx)"
+                    />
+                    <img
+                        :src="item.imgSrc"
+                        :alt="item.name ?? ''"
+                        style="margin: 4px auto 16px auto; width: 90%; height: auto"
+                    />
+                    <div class="item-title">
+                        {{ item.name }}
                     </div>
                 </div>
-            </splide-slide>
-        </splide>
+            </swiper-slide>
+        </swiper-container>
         <BootstrapModal ref="modalRef" :title="$ts(name)" render-body-when-shown>
-            <splide class="modal-slider" :options="{ rewind: true, perPage: 1, start: selectedImageIdx }">
-                <splide-slide v-for="(item, idx) in preparedItems" :key="idx">
+            <swiper-container class="modal-slider" pagination="true">
+                <swiper-slide v-for="(item, idx) in preparedItems" :key="idx">
                     <img
                         :src="item.imgSrc"
                         :alt="item.name ?? ''"
                         style="max-width: 100%; max-height: 100%"
                     />
-                </splide-slide>
-            </splide>
+                </swiper-slide>
+            </swiper-container>
         </BootstrapModal>
     </div>
 </template>
 
 <script setup lang="ts">
-    import { Splide, SplideSlide } from '@splidejs/vue-splide';
-    import '@splidejs/splide/dist/css/splide.min.css';
+    import { useEventListener } from '@vueuse/core';
     import { makeDataImageUrl } from '@/vstutils/utils';
     import BootstrapModal from '@/vstutils/components/BootstrapModal.vue';
     import type { NamedFile } from '../named-binary-file';
-    import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
+    import { computed, ref } from 'vue';
 
     const props = defineProps<{
         items: NamedFile[];
@@ -57,9 +55,10 @@
         (e: 'remove-file', index: number): void;
     }>();
 
-    const splideRef = ref<any>();
+    const swiperRef = ref<any>();
     const modalRef = ref<InstanceType<typeof BootstrapModal>>();
     const selectedImageIdx = ref(0);
+    const slidesPerView = ref(2);
 
     const preparedItems = computed(() => {
         return props.items.map((i) => {
@@ -67,42 +66,18 @@
         });
     });
 
-    watch(preparedItems, () => {
-        nextTick().then(() => {
-            splideRef.value?.splide.refresh();
-        });
-    });
-
-    const options = {
-        rewind: true,
-        focus: 'center',
-        perPage: 2,
-        pagination: false,
-        width: '90vw',
-    };
-
     function onClick(idx: number) {
         selectedImageIdx.value = idx;
         modalRef.value!.open();
     }
 
-    function updateOptions() {
-        const width = splideRef.value?.$el.clientWidth;
+    function calculateSlidesPerView() {
+        const width = swiperRef.value?.clientWidth;
         const perPage = Math.floor(width / 150);
-        if (options.perPage !== perPage) {
-            options.perPage = perPage;
-            if (splideRef.value) {
-                splideRef.value.splide.options = options;
-            }
-        }
+        slidesPerView.value = perPage > 0 ? perPage : 1;
     }
-
-    onMounted(() => {
-        window.addEventListener('resize', updateOptions);
-    });
-    onBeforeUnmount(() => {
-        window.removeEventListener('resize', updateOptions);
-    });
+    calculateSlidesPerView();
+    useEventListener(window, 'resize', calculateSlidesPerView);
 </script>
 
 <style scoped lang="scss">
@@ -119,13 +94,13 @@
             font-size: 14px;
         }
     }
-    .splide__container {
+    .slide {
         height: 100%;
         display: flex;
         align-items: stretch;
         padding: 8px;
     }
-    .splide__content {
+    .content {
         border-radius: 5px;
         position: relative;
         box-shadow: 1px 1px 5px 0 #b0b0b0;
@@ -150,15 +125,12 @@
 
     .modal-slider {
         width: 100%;
+        --swiper-pagination-color: gray;
 
         img {
             width: 100%;
             height: auto;
             object-fit: contain;
         }
-
-        & ::v-deep .splide__pagination__page.is-active {
-            border: 1px solid gray;
-        }
     }
 </style>
diff --git a/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldListView.vue b/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldListView.vue
index 2d01433d..c4160843 100644
--- a/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldListView.vue
+++ b/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldListView.vue
@@ -7,11 +7,11 @@
         @shown="shown = true"
     >
         <template #body>
-            <Splide v-if="shown" :options="options">
-                <SplideSlide v-for="(item, idx) in preparedItems" :key="idx">
+            <swiper-container v-if="shown">
+                <swiper-slide v-for="(item, idx) in preparedItems" :key="idx">
                     <img :src="item.imgSrc" :alt="item.name ?? ''" class="slide-image" />
-                </SplideSlide>
-            </Splide>
+                </swiper-slide>
+            </swiper-container>
         </template>
 
         <template #activator="{ openModal }">
@@ -24,8 +24,6 @@
 
 <script setup lang="ts">
     import { computed, ref } from 'vue';
-    import { Splide, SplideSlide } from '@splidejs/vue-splide';
-
     import { makeDataImageUrl } from '@/vstutils/utils';
     import BootstrapModal from '@/vstutils/components/BootstrapModal.vue';
 
@@ -37,14 +35,6 @@
         value: ExtractRepresent<MultipleNamedBinaryImageField> | null | undefined;
     }>();
 
-    const options = {
-        heightRatio: 1,
-        perPage: 1,
-        perMove: 1,
-        rewind: true,
-        rewindByDrag: true,
-    };
-
     const shown = ref(false);
 
     const preparedItems = computed(() => {
diff --git a/frontend_src/vstutils/fields/files/named-binary-file/__test__/NamedBinFile.test.js b/frontend_src/vstutils/fields/files/named-binary-file/__test__/NamedBinFile.test.js
index 759a8d9b..a6d0b0d1 100644
--- a/frontend_src/vstutils/fields/files/named-binary-file/__test__/NamedBinFile.test.js
+++ b/frontend_src/vstutils/fields/files/named-binary-file/__test__/NamedBinFile.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe } from '@jest/globals';
 import { NamedBinaryFileField } from '../index';
 
 describe('NamedBinFile test', () => {
diff --git a/frontend_src/vstutils/fields/fk/__tests__/DeepFKField.test.js b/frontend_src/vstutils/fields/fk/__tests__/DeepFKField.test.js
index 9ef7634b..2f685285 100644
--- a/frontend_src/vstutils/fields/fk/__tests__/DeepFKField.test.js
+++ b/frontend_src/vstutils/fields/fk/__tests__/DeepFKField.test.js
@@ -1,8 +1,6 @@
-import { expect, test, describe, beforeAll, beforeEach } from '@jest/globals';
 import { reactive } from 'vue';
 import { within } from '@testing-library/dom';
 import { userEvent } from '@testing-library/user-event';
-import fetchMock from 'jest-fetch-mock';
 import { createApp, createSchema, waitFor, mount } from '@/unittests';
 import schema from './DeepFKField-schema.json';
 
@@ -13,7 +11,6 @@ describe('DeepFKfield', () => {
     let deepFkArray;
 
     beforeAll(async () => {
-        fetchMock.enableMocks();
         app = await createApp({ schema: createSchema(schema) });
         Category = app.modelsResolver.byReferencePath('#/definitions/Category');
         deepFk = app.fieldsResolver.resolveField({
diff --git a/frontend_src/vstutils/fields/fk/__tests__/FKfield.test.js b/frontend_src/vstutils/fields/fk/__tests__/FKfield.test.js
index bb43d9fe..0609be9e 100644
--- a/frontend_src/vstutils/fields/fk/__tests__/FKfield.test.js
+++ b/frontend_src/vstutils/fields/fk/__tests__/FKfield.test.js
@@ -1,6 +1,4 @@
-import { expect, test, describe, beforeAll, beforeEach } from '@jest/globals';
-import fetchMock from 'jest-fetch-mock';
-import { createApp } from '../../../../unittests/create-app.js';
+import { createApp } from '../../../../unittests/create-app.ts';
 import { FKField } from '../fk/FKField';
 
 describe('FKfield', () => {
@@ -14,7 +12,6 @@ describe('FKfield', () => {
     beforeAll(async () => {
         app = await createApp();
         modelsClasses = app.modelsResolver._definitionsModels;
-        fetchMock.enableMocks();
     });
 
     test('Test Fk model', async () => {
diff --git a/frontend_src/vstutils/fields/fk/deep-fk/FkTree.vue b/frontend_src/vstutils/fields/fk/deep-fk/FkTree.vue
index 37ac26ac..f0ff4a29 100644
--- a/frontend_src/vstutils/fields/fk/deep-fk/FkTree.vue
+++ b/frontend_src/vstutils/fields/fk/deep-fk/FkTree.vue
@@ -49,7 +49,7 @@
 </template>
 
 <script setup lang="ts">
-    import { ref, computed, onMounted, nextTick } from 'vue';
+    import { ref, computed, onMounted, nextTick, shallowRef } from 'vue';
     // @ts-expect-error liquor-tree has no types
     import * as LiquorTree from 'liquor-tree';
     import { i18n } from '@/vstutils/translation';
@@ -72,7 +72,7 @@
     const onlyLastChild = computed(() => props.field.onlyLastChild);
     const initialized = ref(false);
     const tree = ref();
-    const treeData = ref<any[]>([]);
+    const treeData = shallowRef<any[]>([]);
     const treeFilter = ref('');
     const treeOptions = {
         multiple: props.multiple,
diff --git a/frontend_src/vstutils/fields/fk/fk/FKField.ts b/frontend_src/vstutils/fields/fk/fk/FKField.ts
index a3de66db..67bce55f 100644
--- a/frontend_src/vstutils/fields/fk/fk/FKField.ts
+++ b/frontend_src/vstutils/fields/fk/fk/FKField.ts
@@ -1,14 +1,14 @@
 import { BaseField } from '@/vstutils/fields/base';
 import { onAppBeforeInit } from '@/vstutils/signals';
 import { i18n } from '@/vstutils/translation';
-import type { RepresentData } from '@/vstutils/utils';
+import { type RepresentData, OBJECT_NOT_FOUND_TEXT } from '@/vstutils/utils';
 import { formatPath, getApp, getDependenceValueAsString, RequestTypes } from '@/vstutils/utils';
 
 import FKFieldMixin from './FKFieldMixin';
 import { FKArrayFieldMixin } from './array';
 
 import type { Component, ComponentOptions } from 'vue';
-import type { ModelDefinition } from '@/vstutils/AppConfiguration';
+import type { ModelDefinition } from '@/vstutils/schema';
 import type { FieldOptions, FieldXOptions } from '@/vstutils/fields/base';
 import type { PageView, ViewStore } from '@/vstutils/views';
 import type { Model, ModelConstructor } from '@/vstutils/models';
@@ -83,7 +83,7 @@ export type TInner = number | string;
 export type TRepresent = number | string | Model;
 
 export class FKField extends BaseField<TInner, TRepresent, FKFieldXOptions> implements IFetchableField {
-    static NOT_FOUND_TEXT = '[Object not found]';
+    static NOT_FOUND_TEXT = OBJECT_NOT_FOUND_TEXT;
     readonly _canBeFetched = true;
 
     declare format: string;
diff --git a/frontend_src/vstutils/fields/fk/fk/__tests__/FKField-value-fetch.test.js b/frontend_src/vstutils/fields/fk/fk/__tests__/FKField-value-fetch.test.js
index 39eb27ac..14604e07 100644
--- a/frontend_src/vstutils/fields/fk/fk/__tests__/FKField-value-fetch.test.js
+++ b/frontend_src/vstutils/fields/fk/fk/__tests__/FKField-value-fetch.test.js
@@ -1,6 +1,4 @@
-import { test, describe, beforeAll, expect } from '@jest/globals';
 import { createApp, mount } from '@/unittests';
-import fetchMock from 'jest-fetch-mock';
 import { deferredPromise } from '@/vstutils/utils';
 
 describe('FKField value loader indicator', () => {
@@ -26,7 +24,6 @@ describe('FKField value loader indicator', () => {
                 makeLink: true,
             },
         });
-        fetchMock.enableMocks();
     });
 
     test.each(['readonly', 'edit'])('%s with loader', async (type) => {
diff --git a/frontend_src/vstutils/fields/fk/fk/__tests__/not-available-fk-model-selected.test.js b/frontend_src/vstutils/fields/fk/fk/__tests__/not-available-fk-model-selected.test.js
index c3d8e26b..118e0d37 100644
--- a/frontend_src/vstutils/fields/fk/fk/__tests__/not-available-fk-model-selected.test.js
+++ b/frontend_src/vstutils/fields/fk/fk/__tests__/not-available-fk-model-selected.test.js
@@ -1,4 +1,3 @@
-import { test, expect } from '@jest/globals';
 import { createApp, createSchema, schemaListOf } from '@/unittests';
 
 test('app will return an error if the path for the FK request is not found', async () => {
diff --git a/frontend_src/vstutils/fields/json/__tests__/json.test.js b/frontend_src/vstutils/fields/json/__tests__/json.test.js
index cff0f0d0..88c27b7d 100644
--- a/frontend_src/vstutils/fields/json/__tests__/json.test.js
+++ b/frontend_src/vstutils/fields/json/__tests__/json.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe } from '@jest/globals';
 import JSONField from '../JSONField';
 
 describe('JsonField', () => {
diff --git a/frontend_src/vstutils/fields/nested-object/index.ts b/frontend_src/vstutils/fields/nested-object/index.ts
index 7bd83e07..bd6a1ff3 100644
--- a/frontend_src/vstutils/fields/nested-object/index.ts
+++ b/frontend_src/vstutils/fields/nested-object/index.ts
@@ -16,7 +16,7 @@ import { NestedObjectArrayFieldMixin } from './array';
 
 import type { ModelConstructor } from '@/vstutils/models';
 import type { InnerData, RepresentData } from '@/vstutils/utils';
-import type { ModelDefinition } from '@/vstutils/AppConfiguration';
+import type { ModelDefinition } from '@/vstutils/schema';
 
 type TInner = InnerData;
 type TRepresent = RepresentData;
diff --git a/frontend_src/vstutils/fields/numbers/__tests__/integer.test.js b/frontend_src/vstutils/fields/numbers/__tests__/integer.test.js
index c5e8349c..2a0a50b0 100644
--- a/frontend_src/vstutils/fields/numbers/__tests__/integer.test.js
+++ b/frontend_src/vstutils/fields/numbers/__tests__/integer.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe } from '@jest/globals';
 import { IntegerField } from '../integer';
 
 describe('IntegerField', () => {
diff --git a/frontend_src/vstutils/fields/numbers/__tests__/number.test.js b/frontend_src/vstutils/fields/numbers/__tests__/number.test.js
index edda3402..1eee1458 100644
--- a/frontend_src/vstutils/fields/numbers/__tests__/number.test.js
+++ b/frontend_src/vstutils/fields/numbers/__tests__/number.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe } from '@jest/globals';
 import { NumberField } from '../number';
 
 describe('NumberField', () => {
diff --git a/frontend_src/vstutils/fields/numbers/__tests__/rating.test.js b/frontend_src/vstutils/fields/numbers/__tests__/rating.test.js
index c9555696..9bbee709 100644
--- a/frontend_src/vstutils/fields/numbers/__tests__/rating.test.js
+++ b/frontend_src/vstutils/fields/numbers/__tests__/rating.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe } from '@jest/globals';
 import { RatingField } from '../rating';
 
 describe('RatingField', () => {
diff --git a/frontend_src/vstutils/fields/numbers/decimal/__tests__/decimal.test.js b/frontend_src/vstutils/fields/numbers/decimal/__tests__/decimal.test.js
index 81ed3353..5c5b767d 100644
--- a/frontend_src/vstutils/fields/numbers/decimal/__tests__/decimal.test.js
+++ b/frontend_src/vstutils/fields/numbers/decimal/__tests__/decimal.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe } from '@jest/globals';
 import { DecimalField } from '../../index';
 
 describe('DecimalField', () => {
diff --git a/frontend_src/vstutils/fields/numbers/number.js b/frontend_src/vstutils/fields/numbers/number.js
index 62c47b50..c37fd191 100644
--- a/frontend_src/vstutils/fields/numbers/number.js
+++ b/frontend_src/vstutils/fields/numbers/number.js
@@ -1,5 +1,5 @@
 import { BaseField, BaseFieldContentEdit, BaseFieldMixin } from '../base';
-import { hasOwnProp } from '../../utils';
+import { hasOwnProp } from '../../utils/todo';
 import { NumberArrayFieldMixin } from './array';
 
 export const NumberFieldContentMixin = {
diff --git a/frontend_src/vstutils/fields/related-list/index.ts b/frontend_src/vstutils/fields/related-list/index.ts
index 77cd8f65..5df19542 100644
--- a/frontend_src/vstutils/fields/related-list/index.ts
+++ b/frontend_src/vstutils/fields/related-list/index.ts
@@ -4,7 +4,7 @@ import RelatedListFieldListView from './RelatedListFieldListView.vue';
 import RelatedListFieldReadonlyView from './RelatedListFieldReadonlyView.vue';
 
 import type { FieldOptions, FieldXOptions } from '@/vstutils/fields/base';
-import type { ModelDefinition } from '@/vstutils/AppConfiguration';
+import type { ModelDefinition } from '@/vstutils/schema';
 import type { ModelConstructor } from '@/vstutils/models';
 import type { InnerData } from '@/vstutils/utils';
 
diff --git a/frontend_src/vstutils/fields/text/__tests__/URIField.test.js b/frontend_src/vstutils/fields/text/__tests__/URIField.test.js
index 3fd8b3c7..d4027eb1 100644
--- a/frontend_src/vstutils/fields/text/__tests__/URIField.test.js
+++ b/frontend_src/vstutils/fields/text/__tests__/URIField.test.js
@@ -1,4 +1,3 @@
-import { test, describe, expect } from '@jest/globals';
 import { URIField } from '../URIField';
 
 describe('URIField', () => {
diff --git a/frontend_src/vstutils/fields/text/__tests__/masked.test.js b/frontend_src/vstutils/fields/text/__tests__/masked.test.js
index 4f3a10ac..f9cf4d2b 100644
--- a/frontend_src/vstutils/fields/text/__tests__/masked.test.js
+++ b/frontend_src/vstutils/fields/text/__tests__/masked.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe } from '@jest/globals';
 import { ValidationError } from '../../validation';
 import { MaskedField } from '../masked';
 
diff --git a/frontend_src/vstutils/fields/text/__tests__/phone-field.test.ts b/frontend_src/vstutils/fields/text/__tests__/phone-field.test.ts
index df323df5..476e597c 100644
--- a/frontend_src/vstutils/fields/text/__tests__/phone-field.test.ts
+++ b/frontend_src/vstutils/fields/text/__tests__/phone-field.test.ts
@@ -1,4 +1,3 @@
-import { expect, test, describe } from '@jest/globals';
 import { createApp, createSchema, mount } from '@/unittests';
 
 describe('PhoneField', () => {
diff --git a/frontend_src/vstutils/fields/text/__tests__/textparagraph.test.js b/frontend_src/vstutils/fields/text/__tests__/textparagraph.test.js
index 2e534730..7eedba3e 100644
--- a/frontend_src/vstutils/fields/text/__tests__/textparagraph.test.js
+++ b/frontend_src/vstutils/fields/text/__tests__/textparagraph.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe } from '@jest/globals';
 import { TextParagraphField } from '../TextParagraphField';
 
 describe('TextParagraphField', () => {
diff --git a/frontend_src/vstutils/fields/text/masked.js b/frontend_src/vstutils/fields/text/masked.js
index 7d100de5..bb9fb415 100644
--- a/frontend_src/vstutils/fields/text/masked.js
+++ b/frontend_src/vstutils/fields/text/masked.js
@@ -44,7 +44,9 @@ export const MaskedFieldEdit = {
     },
     methods: {
         setValue(value) {
-            this.$emit('set-value', value);
+            if (value !== this.value) {
+                this.$emit('set-value', value);
+            }
         },
         beforeSet(value) {
             if (!value) return '';
diff --git a/frontend_src/vstutils/fields/text/phone.js b/frontend_src/vstutils/fields/text/phone.js
index c8cdd77e..5a33be5e 100644
--- a/frontend_src/vstutils/fields/text/phone.js
+++ b/frontend_src/vstutils/fields/text/phone.js
@@ -1,5 +1,5 @@
 import { MaskedField, MaskedFieldMixin } from './masked';
-import PhoneFieldContentEdit from './PhoneFieldContentEdit';
+import PhoneFieldContentEdit from './PhoneFieldContentEdit.vue';
 import { BaseFieldContentReadonlyMixin, BaseFieldListView } from '../base';
 import IMask from 'imask';
 import { X_OPTIONS } from '../../utils';
diff --git a/frontend_src/vstutils/init-app.ts b/frontend_src/vstutils/init-app.ts
new file mode 100644
index 00000000..18e2d497
--- /dev/null
+++ b/frontend_src/vstutils/init-app.ts
@@ -0,0 +1,313 @@
+import { UserManager, WebStorageStateStore } from 'oidc-client-ts';
+import OpenAPILoader from '@/vstutils/OpenAPILoader';
+import { createApiFetch } from '@/vstutils/api-fetch';
+import { type AuthAppFactory } from './auth-app';
+import { signals } from '@/vstutils/signals';
+import { App } from '@/vstutils/app';
+import { type Cache, globalCache } from '@/cache';
+import type Vue from 'vue';
+import { createDefaultPageLoader } from './default-page-loader';
+import { type AppSchema } from './schema';
+
+export type LogoutHandler = (params: { config: InitAppConfig }) => void | Promise<void>;
+
+export interface InitAppConfigRaw {
+    el?: string | HTMLElement;
+    pageLoader?: PageLoader;
+    fatalErrorHandler?: FatalErrorHandler;
+    logoutHandler?: LogoutHandler;
+    auth?: {
+        authorityUrl?: string;
+        clientId?: string;
+        clientSecret?: string;
+        redirectUri?: string;
+    };
+    createAuthApp?: AuthAppFactory;
+    cache?: Cache;
+    vue?: typeof Vue;
+    api: {
+        url: string;
+        endpointPath?: string;
+        disableBulk?: boolean;
+    };
+}
+
+export interface InitAppConfig {
+    el: HTMLElement;
+    auth: Oauth2Config;
+    pageLoader: PageLoader;
+    fatalErrorHandler: FatalErrorHandler;
+    logoutHandler: LogoutHandler;
+    createAuthApp?: AuthAppFactory;
+    cache: Cache;
+    vue?: typeof Vue;
+    api: ApiConfig;
+}
+
+interface Oauth2Config {
+    userManager: UserManager;
+}
+
+interface ApiConfig {
+    url: URL;
+    endpointPath: string;
+    disableBulk: boolean;
+}
+
+export async function initApp(rawConf: InitAppConfigRaw) {
+    try {
+        const config = await getConfig(rawConf);
+        await _initApp(config);
+    } catch (e) {
+        (rawConf.fatalErrorHandler ?? defaultStartupFatalErrorHandler)({ error: e });
+    }
+}
+
+export interface PageLoader {
+    show: () => void | Promise<void>;
+    hide: () => void | Promise<void>;
+}
+
+async function _initApp(config: InitAppConfig) {
+    config.pageLoader.show();
+
+    registerSw();
+
+    if (!(await isUserLoggedIn(config))) {
+        await openAuthApp(config);
+        return;
+    }
+
+    const schema = await loadSchema(config);
+
+    const app = new App({ config, schema });
+    // @ts-expect-error It's a global variable
+    window.app = app;
+    await app.start();
+    app.mount(createChildEl(config.el));
+    await config.pageLoader.hide();
+    return app;
+}
+
+async function getConfig(config: InitAppConfigRaw): Promise<InitAppConfig> {
+    const pageLoader = config.pageLoader ?? createDefaultPageLoader();
+    pageLoader.show();
+
+    const apiConfig = {
+        url: new URL(config.api.url.endsWith('/') ? config.api.url : `${config.api.url}/`),
+        endpointPath: config.api.endpointPath ?? 'endpoint/',
+        disableBulk: config.api.disableBulk ?? false,
+    } satisfies ApiConfig;
+
+    return {
+        el: getRootEl(config.el),
+        pageLoader,
+        fatalErrorHandler: config.fatalErrorHandler ?? defaultStartupFatalErrorHandler,
+        logoutHandler: config.logoutHandler ?? defaultLogoutHandler,
+        createAuthApp: config.createAuthApp,
+        auth: {
+            userManager: await _createUserManager(config, apiConfig),
+        },
+        cache: config.cache ?? globalCache,
+        api: apiConfig,
+    };
+}
+
+export async function _createUserManager(config: InitAppConfigRaw, apiConfig: ApiConfig) {
+    const schemaConfig = createSchemaOauthConfigProvider(apiConfig);
+    const providedConfig = config.auth ?? {};
+
+    const authority = providedConfig.authorityUrl || (await schemaConfig.getAuthorityUrl());
+    if (!authority) {
+        throw new Error('Authority is not provided');
+    }
+    const clientId = providedConfig.clientId || (await schemaConfig.getClientId());
+    if (!clientId) {
+        throw new Error('Client id is not provided');
+    }
+    return new UserManager({
+        authority,
+        client_id: clientId,
+        client_secret: providedConfig.clientSecret,
+        redirect_uri: providedConfig.redirectUri ?? 'not_used',
+        monitorSession: true,
+        scope: '',
+        userStore: new WebStorageStateStore({ store: window.localStorage }),
+    });
+}
+
+async function openAuthApp(config: InitAppConfig) {
+    const authAppFactory =
+        config.createAuthApp ?? (await import('@/vstutils/default-auth-app')).createDefaultAuthApp;
+    const child = createChildEl(config.el);
+
+    const authApp = await authAppFactory({
+        config,
+        openMainApp: (path) => void openMainApp(path),
+    });
+
+    async function openMainApp(path?: string) {
+        authApp.destroy();
+        config.el.innerHTML = '';
+        window.location.hash = path ?? '/';
+        await _initApp(config);
+    }
+    config.pageLoader.hide();
+    authApp.mount(child);
+}
+
+function getRootEl(el?: string | HTMLElement): HTMLElement {
+    if (typeof el === 'string') {
+        return document.querySelector(el)!;
+    }
+    if (el && typeof el === 'object') {
+        return el;
+    }
+    return document.getElementById('app')!;
+}
+
+function createChildEl(el: HTMLElement) {
+    const wrapper = el.ownerDocument.createElement('div');
+    el.appendChild(wrapper);
+    return wrapper;
+}
+
+function registerSw() {
+    if ('serviceWorker' in navigator) {
+        navigator.serviceWorker.register('/service-worker.js').catch((error) => {
+            console.error('Service Worker registration failed with ' + error);
+        });
+    }
+}
+
+async function isUserLoggedIn(config: InitAppConfig) {
+    const userManager = config.auth.userManager;
+    if (!(await userManager.getUser())) {
+        return false;
+    }
+    const userInfoEndpoint = await userManager.metadataService.getUserInfoEndpoint();
+    const apiFetch = createApiFetch({ config });
+    const response = await apiFetch(userInfoEndpoint);
+    if (response.status === 200) {
+        return true;
+    }
+    return false;
+}
+
+async function loadSchema(config: InitAppConfig) {
+    const schemaLoader = new OpenAPILoader({ config });
+    window.schemaLoader = schemaLoader;
+    const schema = await schemaLoader.loadSchema();
+    signals.emit('openapi.loaded', schema);
+    return schema;
+}
+
+function createSchemaOauthConfigProvider(apiConfig: ApiConfig) {
+    const loadSchemaOnce = (() => {
+        let schema: AppSchema | null = null;
+
+        return async (): Promise<AppSchema> => {
+            if (schema) {
+                return schema;
+            }
+            const url = new URL(apiConfig.endpointPath, apiConfig.url);
+            url.searchParams.set('format', 'openapi');
+            const response = await fetch(url);
+            schema = await response.json();
+            return schema as AppSchema;
+        };
+    })();
+
+    async function getAuthorityUrl() {
+        const schema = await loadSchemaOnce();
+        for (const def of Object.values(schema.securityDefinitions ?? {})) {
+            if (def.type === 'oauth2') {
+                if ('authorizationUrl' in def) {
+                    return new URL(def.authorizationUrl).origin;
+                }
+                if ('tokenUrl' in def) {
+                    return new URL(def.tokenUrl).origin;
+                }
+            }
+        }
+        return;
+    }
+
+    async function getClientId() {
+        const schema = await loadSchemaOnce();
+        for (const def of Object.values(schema.securityDefinitions ?? {})) {
+            if (def.type === 'oauth2') {
+                if ('x-clientId' in def && def['x-clientId']) {
+                    return def['x-clientId'] as string;
+                }
+            }
+        }
+        return;
+    }
+
+    return {
+        getAuthorityUrl,
+        getClientId,
+    };
+}
+
+type FatalErrorHandler = (params: { error: unknown }) => any;
+
+export const createStartupFatalErrorHandler = (f: FatalErrorHandler) => f;
+
+const defaultStartupFatalErrorHandler = createStartupFatalErrorHandler(({ error }) => {
+    console.error('Fatal error', error);
+
+    const title = document.createElement('p');
+    title.innerText = 'Error occurred!';
+    title.setAttribute(
+        'style',
+        `
+            font-size: 2rem;
+        `,
+    );
+
+    const text = document.createElement('p');
+    text.textContent = `Details: ${error}`;
+    text.setAttribute(
+        'style',
+        `
+            color: gray;
+            font-size: 0.7rem;
+            font-family: monospace;
+        `,
+    );
+
+    const wrapper = document.createElement('div');
+    wrapper.setAttribute(
+        'style',
+        `
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100vw;
+            height: 100vh;
+            background: white;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            flex-direction: column;
+        `,
+    );
+    wrapper.appendChild(title);
+    wrapper.appendChild(text);
+    document.body.innerHTML = '';
+    document.body.insertAdjacentElement('beforeend', wrapper);
+
+    throw error;
+});
+
+const defaultLogoutHandler: LogoutHandler = async ({ config }) => {
+    try {
+        await config.auth.userManager.revokeTokens();
+    } catch (error) {
+        console.error('Revoke error', error);
+    }
+    await config.auth.userManager.removeUser();
+    window.location.href = '/';
+};
diff --git a/frontend_src/vstutils/models/Model.ts b/frontend_src/vstutils/models/Model.ts
index 3f123bbc..c4c42eb3 100644
--- a/frontend_src/vstutils/models/Model.ts
+++ b/frontend_src/vstutils/models/Model.ts
@@ -2,7 +2,7 @@ import type { APIResponse } from '../api';
 import type { Field } from '../fields/base';
 import type { QuerySet } from '../querySet';
 import type { HttpMethod, InnerData, RepresentData } from '@/vstutils/utils';
-import type { MODEL_MODES } from '@/vstutils/AppConfiguration';
+import type { MODEL_MODES } from '@/vstutils/schema';
 import {
     deepEqual,
     escapeHtml,
diff --git a/frontend_src/vstutils/models/ModelsResolver.ts b/frontend_src/vstutils/models/ModelsResolver.ts
index 6e135d3f..f0af1df8 100644
--- a/frontend_src/vstutils/models/ModelsResolver.ts
+++ b/frontend_src/vstutils/models/ModelsResolver.ts
@@ -6,8 +6,8 @@ import type { ModelConstructor } from './Model';
 import { BaseModel } from './Model';
 import { makeModel } from './utils';
 
-import { MODEL_MODES } from '@/vstutils/AppConfiguration';
-import type { AppSchema, ModelDefinition } from '@/vstutils/AppConfiguration';
+import { MODEL_MODES } from '@/vstutils/schema';
+import type { AppSchema, ModelDefinition } from '@/vstutils/schema';
 import type { FieldsResolver } from '@/vstutils/fields';
 import AddKeyField from '../additionalProperties/AddKeyField.vue';
 import type { FieldDefinition } from '../fields/FieldsResolver';
diff --git a/frontend_src/vstutils/models/__tests__/Model.test.js b/frontend_src/vstutils/models/__tests__/Model.test.js
index 36d8e301..af86c440 100644
--- a/frontend_src/vstutils/models/__tests__/Model.test.js
+++ b/frontend_src/vstutils/models/__tests__/Model.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe, it } from '@jest/globals';
 import { BaseModel, makeModel } from '../index.ts';
 import { StringField } from '../../fields/text';
 import { IntegerField } from '../../fields/numbers/integer.js';
@@ -74,7 +73,7 @@ describe('Model', () => {
         expect(user['email']).toBe('name@domain.com');
 
         // Set value and check that 'toInner' is invoked
-        const settingsSpy = jest.spyOn(user._fields.get('settings'), 'toInner');
+        const settingsSpy = vitest.spyOn(user._fields.get('settings'), 'toInner');
         user.settings = { param1: 'value2', param2: 2, param3: false };
         user._validateAndSetData();
         expect(settingsSpy).toBeCalledTimes(1);
diff --git a/frontend_src/vstutils/models/__tests__/additionalProperties.test.ts b/frontend_src/vstutils/models/__tests__/additionalProperties.test.ts
index e6a388fa..aa86c4aa 100644
--- a/frontend_src/vstutils/models/__tests__/additionalProperties.test.ts
+++ b/frontend_src/vstutils/models/__tests__/additionalProperties.test.ts
@@ -1,9 +1,7 @@
-import { expect, test, beforeAll, beforeEach } from '@jest/globals';
-import { createApp, createSchema, schemaListOf, mountApp, waitForPageLoading, openPage } from '@/unittests';
+import { createApp, createSchema, schemaListOf, waitForPageLoading, openPage } from '@/unittests';
 import type { getApp } from '@/vstutils/utils';
 import { ModelValidationError } from '..';
 import { emptyInnerData } from '@/vstutils/utils';
-import fetchMock from 'jest-fetch-mock';
 import { screen } from '@testing-library/dom';
 
 let app: Awaited<ReturnType<typeof getApp>>;
@@ -172,11 +170,7 @@ const schema = createSchema({
 });
 
 beforeAll(async () => {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    // @ts-expect-error this is just a test
     app = await createApp({ schema });
-    await mountApp();
-    fetchMock.enableMocks();
 });
 
 beforeEach(async () => {
diff --git a/frontend_src/vstutils/models/__tests__/data-based-fields-visibility.test.ts b/frontend_src/vstutils/models/__tests__/data-based-fields-visibility.test.ts
index 53af4a50..cd0f0ed3 100644
--- a/frontend_src/vstutils/models/__tests__/data-based-fields-visibility.test.ts
+++ b/frontend_src/vstutils/models/__tests__/data-based-fields-visibility.test.ts
@@ -1,6 +1,4 @@
-import { expect, test, beforeAll, describe } from '@jest/globals';
-import { createApp, createSchema, schemaListOf, mountApp, useTestCtx } from '@/unittests';
-import fetchMock from 'jest-fetch-mock';
+import { createApp, createSchema, schemaListOf, useTestCtx } from '@/unittests';
 
 const schema = createSchema({
     paths: {
@@ -69,18 +67,16 @@ const schema = createSchema({
 
 beforeAll(async () => {
     const app = await createApp({ schema });
-    await mountApp();
     app.api.disableBulk = true;
 });
 
 describe('data based fields visibility', () => {
     test('detail readonly', async () => {
         const { app, screen } = useTestCtx();
-        fetchMock.enableMocks();
 
         // All fields visible
         fetchMock.mockOnceIf(
-            'http://test.vst/api/v1/test/1/',
+            'http://localhost/api/v1/test/1/',
             JSON.stringify({
                 id: 1,
                 field1: 'field1 value',
@@ -94,7 +90,7 @@ describe('data based fields visibility', () => {
 
         // One field hidden
         fetchMock.mockOnceIf(
-            'http://test.vst/api/v1/test/2/',
+            'http://localhost/api/v1/test/2/',
             JSON.stringify({
                 id: 2,
                 field1: 'field1 value',
@@ -112,11 +108,10 @@ describe('data based fields visibility', () => {
 
     test('detail edit', async () => {
         const { app, screen } = useTestCtx();
-        fetchMock.enableMocks();
 
         // All fields visible
         fetchMock.mockOnceIf(
-            'http://test.vst/api/v1/test/1/',
+            'http://localhost/api/v1/test/1/',
             JSON.stringify({
                 id: 1,
                 field1: 'field1 value',
@@ -131,7 +126,7 @@ describe('data based fields visibility', () => {
 
         // One field hidden
         fetchMock.mockOnceIf(
-            'http://test.vst/api/v1/test/2/',
+            'http://localhost/api/v1/test/2/',
             JSON.stringify({
                 id: 2,
                 field1: 'field1 value',
diff --git a/frontend_src/vstutils/models/__tests__/errors.test.js b/frontend_src/vstutils/models/__tests__/errors.test.js
index 2dffc39c..aec4a4eb 100644
--- a/frontend_src/vstutils/models/__tests__/errors.test.js
+++ b/frontend_src/vstutils/models/__tests__/errors.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe } from '@jest/globals';
 import { StringField } from '@/vstutils/fields/text';
 import { ModelValidationError } from './../errors';
 
diff --git a/frontend_src/vstutils/models/__tests__/models-generation.test.ts b/frontend_src/vstutils/models/__tests__/models-generation.test.ts
index a2034d90..68c21a1b 100644
--- a/frontend_src/vstutils/models/__tests__/models-generation.test.ts
+++ b/frontend_src/vstutils/models/__tests__/models-generation.test.ts
@@ -1,4 +1,3 @@
-import { describe, beforeAll, test, expect } from '@jest/globals';
 import { createApp, createSchema } from '@/unittests';
 import { getApp } from '@/vstutils/utils';
 
diff --git a/frontend_src/vstutils/models/__tests__/readonly-fields-validation.test.ts b/frontend_src/vstutils/models/__tests__/readonly-fields-validation.test.ts
index 8bbe66be..ece3c621 100644
--- a/frontend_src/vstutils/models/__tests__/readonly-fields-validation.test.ts
+++ b/frontend_src/vstutils/models/__tests__/readonly-fields-validation.test.ts
@@ -1,6 +1,4 @@
-import { expect, test, beforeAll } from '@jest/globals';
-import { enableFetchMocks } from 'jest-fetch-mock';
-import { createApp, createSchema, mountApp, useTestCtx } from '@/unittests';
+import { createApp, createSchema, useTestCtx } from '@/unittests';
 
 beforeAll(async () => {
     await createApp({
@@ -59,8 +57,6 @@ beforeAll(async () => {
             },
         }),
     });
-    await mountApp();
-    enableFetchMocks();
 });
 
 test('readonly fields validation', async () => {
@@ -78,7 +74,7 @@ test('readonly fields validation', async () => {
 
     // Save value and mock response
     fetchMock.mockResponseOnce(async (req) => {
-        expect(req.url).toBe('http://test.vst/api/v1/some_path/1/');
+        expect(req.url).toBe('http://localhost/api/v1/some_path/1/');
         expect(req.method).toBe('PATCH');
         expect(await req.json()).toStrictEqual({ name: 'Some new name' });
 
diff --git a/frontend_src/vstutils/models/sandbox.ts b/frontend_src/vstutils/models/sandbox.ts
index e5db240b..d926b18b 100644
--- a/frontend_src/vstutils/models/sandbox.ts
+++ b/frontend_src/vstutils/models/sandbox.ts
@@ -219,7 +219,7 @@ export function createModelSandbox(instance: Model) {
         _changedFields.value.clear();
     }
 
-    return markRaw({
+    const sandbox = {
         set,
         setPrefetchedValue,
         reset,
@@ -240,5 +240,7 @@ export function createModelSandbox(instance: Model) {
             // (https://blog.vuejs.org/posts/vue-2-7-naruto)
             return getData();
         },
-    });
+    };
+
+    return markRaw(sandbox) as typeof sandbox;
 }
diff --git a/frontend_src/app_loader/LoadingPageController.js b/frontend_src/vstutils/page-loader/index.js
similarity index 97%
rename from frontend_src/app_loader/LoadingPageController.js
rename to frontend_src/vstutils/page-loader/index.js
index 0535dd28..39f1653d 100644
--- a/frontend_src/app_loader/LoadingPageController.js
+++ b/frontend_src/vstutils/page-loader/index.js
@@ -1,4 +1,5 @@
 import './style.css';
+import { cleanAllCacheAndReloadPage } from '@/vstutils/cleanCacheHelpers.js';
 
 /**
  * Function creates DOM element and sets it attributes and props.
@@ -37,7 +38,7 @@ function createDomElement(type, attributes, props) {
  * DOM element, that collects loading logs and shows status of app dependencies loading.
  * This class loads only app's dependencies, it does not create/load app instance.
  */
-class LoadingPageController {
+export class LoadingPageController {
     /**
      * Constructor of AppDependenciesLoader Class.
      */
@@ -102,7 +103,7 @@ class LoadingPageController {
         let reloadButtonLink = createDomElement('a', [], {
             href: '#',
             onclick: () => {
-                window.cleanAllCacheAndReloadPage();
+                cleanAllCacheAndReloadPage();
                 return false;
             },
         });
@@ -264,8 +265,10 @@ class LoadingPageController {
             }, 30);
         }
 
-        document.querySelector('#RealBody').style.display = 'block';
-        fadeOutAndRemove(document.querySelector('#LoadingProgressBar'));
+        const progressBar = document.querySelector('#LoadingProgressBar');
+        if (progressBar) {
+            fadeOutAndRemove(progressBar);
+        }
     }
 
     /**
@@ -390,5 +393,3 @@ class LoadingPageController {
         }
     }
 }
-
-export default LoadingPageController;
diff --git a/frontend_src/app_loader/style.css b/frontend_src/vstutils/page-loader/style.css
similarity index 100%
rename from frontend_src/app_loader/style.css
rename to frontend_src/vstutils/page-loader/style.css
diff --git a/frontend_src/vstutils/popUp/__tests__/ErrorHandler.test.js b/frontend_src/vstutils/popUp/__tests__/ErrorHandler.test.js
index 16bfeaa7..b26665d1 100644
--- a/frontend_src/vstutils/popUp/__tests__/ErrorHandler.test.js
+++ b/frontend_src/vstutils/popUp/__tests__/ErrorHandler.test.js
@@ -1,10 +1,9 @@
-import { expect, jest, test, describe } from '@jest/globals';
 import ErrorHandler from '../ErrorHandler.js';
 import { StringField } from '../../fields/text';
 import { guiPopUp } from '../PopUp';
 import { ModelValidationError } from '@/vstutils/models';
 
-jest.mock('../PopUp');
+vitest.mock('../PopUp');
 
 describe('Error Handler', () => {
     test('error to string', () => {
@@ -48,7 +47,7 @@ describe('Error Handler', () => {
         const objDataError = { data: { random: 'random' } };
         expect(handler.errorToString(objDataError)).toBe('<br><b>random</b>: random');
 
-        global.console = { error: jest.fn() };
+        global.console = { error: vitest.fn() };
 
         handler.defineErrorAndShow('Err 1');
         handler.showError('Err 1', 'console');
diff --git a/frontend_src/vstutils/querySet/__tests__/QuerySet-prefetch.test.js b/frontend_src/vstutils/querySet/__tests__/QuerySet-prefetch.test.js
index 279ee1cf..dcd1cde0 100644
--- a/frontend_src/vstutils/querySet/__tests__/QuerySet-prefetch.test.js
+++ b/frontend_src/vstutils/querySet/__tests__/QuerySet-prefetch.test.js
@@ -1,5 +1,3 @@
-import { beforeAll, beforeEach, describe, expect, test } from '@jest/globals';
-import fetchMock from 'jest-fetch-mock';
 import { RequestTypes } from '@/vstutils/utils';
 import { createApp } from '@/unittests';
 import { QuerySet } from '../QuerySet';
@@ -12,7 +10,6 @@ describe('QuerySet prefetch', () => {
         app = await createApp();
         User = app.modelsResolver.byReferencePath('#/definitions/User');
         User.nonBulkMethods = ['get'];
-        fetchMock.enableMocks();
     });
 
     beforeEach(() => {
diff --git a/frontend_src/vstutils/querySet/__tests__/QuerySet.test.js b/frontend_src/vstutils/querySet/__tests__/QuerySet.test.js
index e40da605..2806eb7d 100644
--- a/frontend_src/vstutils/querySet/__tests__/QuerySet.test.js
+++ b/frontend_src/vstutils/querySet/__tests__/QuerySet.test.js
@@ -1,7 +1,5 @@
-import { beforeAll, beforeEach, describe, expect, test } from '@jest/globals';
 import { IntegerField } from '../../fields/numbers/integer';
 import { apiConnector, APIResponse } from '../../api';
-import fetchMock from 'jest-fetch-mock';
 import { makeModel, BaseModel } from '../../models';
 import StringField from '../../fields/text/StringField';
 import { QuerySet } from '../QuerySet';
@@ -23,7 +21,6 @@ describe('QuerySet', () => {
         apiConnector.defaultVersion = 'v1';
         apiConnector.baseURL = 'http://localhost/api';
         apiConnector.endpointURL = 'http://localhost/api/endpoint/';
-        fetchMock.enableMocks();
     });
 
     beforeEach(() => {
diff --git a/frontend_src/vstutils/querySet/__tests__/QuerySetResolver.test.js b/frontend_src/vstutils/querySet/__tests__/QuerySetResolver.test.js
index 1278b3cc..574a0b2e 100644
--- a/frontend_src/vstutils/querySet/__tests__/QuerySetResolver.test.js
+++ b/frontend_src/vstutils/querySet/__tests__/QuerySetResolver.test.js
@@ -1,4 +1,3 @@
-import { describe, expect, test } from '@jest/globals';
 import { IntegerField } from '../../fields/numbers/integer.js';
 import { BaseModel, makeModel } from '../../models';
 import { RequestTypes } from '../../utils';
diff --git a/frontend_src/vstutils/querySet/__tests__/bulk.test.js b/frontend_src/vstutils/querySet/__tests__/bulk.test.js
index 620cc90b..ca9cf1e0 100644
--- a/frontend_src/vstutils/querySet/__tests__/bulk.test.js
+++ b/frontend_src/vstutils/querySet/__tests__/bulk.test.js
@@ -1,5 +1,3 @@
-import { beforeAll, beforeEach, describe, expect, test } from '@jest/globals';
-import fetchMock from 'jest-fetch-mock';
 import { apiConnector } from '../../api';
 import { BaseModel, makeModel } from '../../models';
 import { QuerySet } from '../QuerySet.ts';
@@ -12,7 +10,6 @@ describe('bulk or non bulk selection', () => {
     beforeAll(() => {
         apiConnector.defaultVersion = 'v1';
         apiConnector.baseURL = 'http://localhost/api';
-        fetchMock.enableMocks();
     });
 
     beforeEach(() => {
diff --git a/frontend_src/vstutils/querySet/__tests__/entity-update-race.test.ts b/frontend_src/vstutils/querySet/__tests__/entity-update-race.test.ts
index b4bbc4ea..76b46969 100644
--- a/frontend_src/vstutils/querySet/__tests__/entity-update-race.test.ts
+++ b/frontend_src/vstutils/querySet/__tests__/entity-update-race.test.ts
@@ -1,20 +1,16 @@
-import { jest, expect, test, beforeAll } from '@jest/globals';
-import { createApp, createSchema, mountApp, waitForPageLoading } from '@/unittests';
+import { createApp, createSchema, expectRequest, fetchMockCallAt, waitForPageLoading } from '@/unittests';
 import { screen, fireEvent, waitFor } from '@testing-library/dom';
-import fetchMock from 'jest-fetch-mock';
 import { getApp } from '@/vstutils/utils';
 import { useViewStore } from '@/vstutils/store';
 import type { PageEditView } from '@/vstutils/views';
 
 beforeAll(async () => {
     await createApp({ schema: createSchema() });
-    await mountApp();
-    fetchMock.enableMocks();
 });
 
 test('entity update race', async () => {
     const app = getApp();
-    const confirm = jest.spyOn(globalThis, 'confirm');
+    const confirm = vitest.spyOn(globalThis, 'confirm');
 
     fetchMock.mockResponse(
         JSON.stringify([
@@ -52,7 +48,8 @@ test('entity update race', async () => {
     fireEvent.click(screen.getByTitle('Save'));
     await waitForPageLoading();
     expect(fetchMock).toBeCalledTimes(1);
-    expect(fetchMock).toBeCalledWith('http://localhost/api/endpoint/', {
+    expectRequest(fetchMockCallAt(0), {
+        url: 'http://localhost/api/endpoint/',
         body: JSON.stringify([
             {
                 method: 'patch',
@@ -81,7 +78,8 @@ test('entity update race', async () => {
     fireEvent.click(screen.getByTitle('Save'));
     await waitForPageLoading();
     await waitFor(() => expect(fetchMock).toBeCalledTimes(2));
-    expect(fetchMock).toBeCalledWith('http://localhost/api/endpoint/', {
+    expectRequest(fetchMockCallAt(0), {
+        url: 'http://localhost/api/endpoint/',
         body: JSON.stringify([
             {
                 method: 'patch',
@@ -93,7 +91,8 @@ test('entity update race', async () => {
         headers: { 'Content-Type': 'application/json' },
         method: 'put',
     });
-    expect(fetchMock).toBeCalledWith('http://localhost/api/endpoint/', {
+    expectRequest(fetchMockCallAt(1), {
+        url: 'http://localhost/api/endpoint/',
         body: JSON.stringify([
             {
                 method: 'patch',
diff --git a/frontend_src/vstutils/querySet/__tests__/fetch-values.test.js b/frontend_src/vstutils/querySet/__tests__/fetch-values.test.js
index aa295054..5f5d2e86 100644
--- a/frontend_src/vstutils/querySet/__tests__/fetch-values.test.js
+++ b/frontend_src/vstutils/querySet/__tests__/fetch-values.test.js
@@ -1,6 +1,5 @@
-import { test, beforeAll, expect, beforeEach } from '@jest/globals';
-import fetchMock from 'jest-fetch-mock';
-import { createApp, openPage } from '@/unittests';
+import { waitFor } from '@testing-library/dom';
+import { createApp, expectNthRequest } from '@/unittests';
 import { fetchInstances } from '@/vstutils/fetch-values';
 import { ArrayField } from '@/vstutils/fields/array';
 
@@ -10,8 +9,9 @@ let User;
 beforeAll(async () => {
     app = await createApp();
     User = app.modelsResolver.byReferencePath('#/definitions/User');
-    await openPage('/user/');
-    fetchMock.enableMocks();
+    fetchMock.mockResponse(JSON.stringify([{ count: 0, results: [] }]));
+    app.router.push('/user');
+    await waitFor(() => expect(fetchMock).toBeCalledTimes(1));
 });
 
 beforeEach(() => {
@@ -99,16 +99,15 @@ test('fk fetching', async () => {
     expect(instances[5].some_fk).toBeUndefined();
 
     expect(fetchMock).toBeCalledTimes(1);
-    const [, request] = fetchMock.mock.calls[0];
-    const body = JSON.parse(request.body);
-
-    expect(body).toStrictEqual([
-        {
-            method: 'get',
-            path: ['user'],
-            query: new URLSearchParams({ id: '5,3,1', limit: '3' }).toString(),
-        },
-    ]);
+    expectNthRequest(0, {
+        body: [
+            {
+                method: 'get',
+                path: ['user'],
+                query: new URLSearchParams({ id: '5,3,1', limit: '3' }).toString(),
+            },
+        ],
+    });
 });
 
 test('dynamic with fk fetching', async () => {
@@ -153,16 +152,15 @@ test('dynamic with fk fetching', async () => {
     await fetchInstances(instances);
 
     expect(fetchMock).toBeCalledTimes(1);
-    const [, request] = fetchMock.mock.calls[0];
-    const body = JSON.parse(request.body);
-
-    expect(body).toStrictEqual([
-        {
-            method: 'get',
-            path: ['user'],
-            query: new URLSearchParams({ id: '1337', limit: '1' }).toString(),
-        },
-    ]);
+    expectNthRequest(0, {
+        body: [
+            {
+                method: 'get',
+                path: ['user'],
+                query: new URLSearchParams({ id: '1337', limit: '1' }).toString(),
+            },
+        ],
+    });
 
     // Fk should become instances
     expect(instances[0].dynamic).toBeInstanceOf(User);
@@ -233,16 +231,15 @@ test('related list with array with dynamic with fk fetching', async () => {
     await fetchInstances(instances);
 
     expect(fetchMock).toBeCalledTimes(1);
-    const [, request] = fetchMock.mock.calls[0];
-    const body = JSON.parse(request.body);
-
-    expect(body).toStrictEqual([
-        {
-            method: 'get',
-            path: ['user'],
-            query: new URLSearchParams({ id: '1001,1000', limit: '2' }).toString(),
-        },
-    ]);
+    expectNthRequest(0, {
+        body: [
+            {
+                method: 'get',
+                path: ['user'],
+                query: new URLSearchParams({ id: '1001,1000', limit: '2' }).toString(),
+            },
+        ],
+    });
 
     // Integers should not be changed
     expect(instances[0].related_list[0].list).toStrictEqual([1, 2, 3]);
diff --git a/frontend_src/vstutils/router/RouterConstructor.ts b/frontend_src/vstutils/router/RouterConstructor.ts
index 60e73797..ce3ec95d 100644
--- a/frontend_src/vstutils/router/RouterConstructor.ts
+++ b/frontend_src/vstutils/router/RouterConstructor.ts
@@ -1,5 +1,5 @@
 import VueRouter from 'vue-router';
-import { signals } from '@/vstutils/signals';
+import { signals, ROUTES_CREATED } from '@/vstutils/signals';
 
 import type { RouteConfig } from 'vue-router';
 import type { IView } from '@/vstutils/views';
@@ -26,7 +26,7 @@ export default class RouterConstructor {
     formAllRoutes() {
         const routes: RouteConfig[] = this.formRoutesBasedOnViews();
 
-        signals.emit('allRoutes.created', routes);
+        signals.emit(ROUTES_CREATED, routes);
 
         return routes;
     }
diff --git a/frontend_src/vstutils/schema.ts b/frontend_src/vstutils/schema.ts
new file mode 100644
index 00000000..916d02c4
--- /dev/null
+++ b/frontend_src/vstutils/schema.ts
@@ -0,0 +1,79 @@
+import type * as swagger from 'swagger-schema-official';
+import type { FieldDefinition } from './fields/FieldsResolver';
+import { type HttpMethod } from './utils';
+
+declare global {
+    interface Window {
+        host_url: string;
+        gui_version: string;
+        gui_user_version: string;
+        is_superuser: boolean;
+        is_staff: boolean;
+    }
+}
+
+export interface XMenuItem {
+    name: string;
+    span_class?: string | string[];
+    url?: string;
+    origin_link?: boolean;
+    sublinks?: XMenuItem[];
+}
+
+export type XMenu = XMenuItem[];
+
+export interface AppInfo extends swagger.Info {
+    'x-settings': {
+        static_path: string;
+        login_url: string;
+        logout_url: string;
+        [key: string]: any;
+    };
+    'x-versions': {
+        application: string;
+        library: string;
+        vstutils: string;
+    };
+    'x-docs': {
+        has_docs: boolean;
+        docs_url: string;
+    };
+    'x-page-limit': number;
+    'x-menu': XMenu;
+    'x-centrifugo-address'?: string;
+    'x-centrifugo-token'?: string;
+    'x-subscriptions-prefix': string;
+    'x-webpush'?: {
+        public_key: string;
+        user_settings_subpath: string | null;
+    };
+    [key: string]: any;
+}
+
+export const MODEL_MODES = ['DEFAULT', 'STEP'] as const;
+
+export type ModelDefinition = swagger.Schema & {
+    properties?: Record<string, FieldDefinition>;
+    'x-properties-groups'?: Record<string, string[]>;
+    'x-view-field-name'?: string;
+    'x-non-bulk-methods'?: HttpMethod[];
+    'x-translate-model'?: string;
+    'x-hide-not-required'?: boolean;
+    'x-display-mode'?: typeof MODEL_MODES[number];
+    'x-visibility-data-field-name'?: string;
+};
+
+export interface Operation extends swagger.Operation {
+    'x-hidden'?: boolean;
+}
+
+export type Path = swagger.Path & {
+    [key in HttpMethod]?: Operation | undefined;
+};
+
+export interface AppSchema extends swagger.Spec {
+    info: AppInfo;
+    definitions: Record<string, ModelDefinition>;
+    paths: Record<string, Path>;
+    [key: string]: any;
+}
diff --git a/frontend_src/vstutils/signals.ts b/frontend_src/vstutils/signals.ts
index 8d61bf9b..6eb7f510 100644
--- a/frontend_src/vstutils/signals.ts
+++ b/frontend_src/vstutils/signals.ts
@@ -7,14 +7,18 @@ import type { Model } from '@/vstutils/models';
 import type { IAppInitialized } from '@/vstutils/app';
 import type { RepresentData } from '@/vstutils/utils';
 import type { Action, Sublink } from '@/vstutils/views';
+import type { RouteConfig } from 'vue-router';
+import type { AppSchema } from './schema';
 
 export const signals = new TabSignal('application');
 
+export const SCHEMA_LOADED = 'openapi.loaded';
 export const APP_CREATED = 'APP_CREATED';
 export const APP_AFTER_INIT = 'app.afterInit';
 export const APP_BEFORE_INIT = 'app.beforeInit';
 export const SCHEMA_MODELS_CREATED = 'allModels.created';
 export const SCHEMA_VIEWS_CREATED = 'allViews.created';
+export const ROUTES_CREATED = 'allRoutes.created';
 
 export function useSignalSubscription(name: string, callback: (...args: any[]) => void) {
     const signalSlot = signals.on({
@@ -80,9 +84,13 @@ const createHook = (() => {
     };
 })();
 
+export const onAppCreated = createHook<[{ app: IAppInitialized }]>(APP_CREATED);
 export const onAppAfterInit = createHook<[{ app: IAppInitialized }]>(APP_AFTER_INIT);
 export const onAppBeforeInit = createHook<[{ app: IAppInitialized }]>(APP_BEFORE_INIT);
 export const onSchemaViewsCreated = createHook<[{ views: IAppInitialized['views'] }]>(SCHEMA_VIEWS_CREATED);
+export const onRoutesCreated = createHook<[RouteConfig[]]>(ROUTES_CREATED);
+export const onSchemaLoaded = createHook<[AppSchema]>(SCHEMA_LOADED);
+
 export const onSchemaModelsCreated =
     createHook<[{ app: IAppInitialized; models: Map<string, Model> }]>(SCHEMA_MODELS_CREATED);
 
diff --git a/frontend_src/vstutils/store/__tests__/actionViewStore.test.js b/frontend_src/vstutils/store/__tests__/actionViewStore.test.js
index c23d8fcc..2c5eb2c4 100644
--- a/frontend_src/vstutils/store/__tests__/actionViewStore.test.js
+++ b/frontend_src/vstutils/store/__tests__/actionViewStore.test.js
@@ -1,19 +1,12 @@
-import { test, expect, beforeAll } from '@jest/globals';
-import { createApp, createSchema, mountApp, waitForPageLoading } from '@/unittests';
+import { createApp, createSchema, expectRequest, waitForPageLoading } from '@/unittests';
 import detailPageSchema from './detailPage-schema.json';
 import { ActionView } from '../../views';
-import fetchMock from 'jest-fetch-mock';
-
-beforeAll(() => {
-    fetchMock.enableMocks();
-});
 
 test('createActionViewStore', async () => {
     // Created schema and Model
     const app = await createApp({
         schema: createSchema(detailPageSchema),
     });
-    await mountApp();
 
     const actionView = app.views.get('/some_list/some_action/');
     expect(actionView).toBeInstanceOf(ActionView);
@@ -52,12 +45,15 @@ test('createActionViewStore', async () => {
         );
         await store.execute();
         expect(fetchMock).toBeCalledTimes(1);
-        let [, request] = fetchMock.mock.calls[0];
-        let bulk = JSON.parse(request.body);
-        expect(bulk[0].method).toBe('post');
-        expect(bulk[0].path).toStrictEqual('/some_list/some_action/');
-        // expecting that 'choices' is sent too because it's required and has
-        // enum, so the first value of this enum should be sent
-        expect(bulk[0].data).toStrictEqual({ text: 'Mshvill', choice: 'one' });
+        let [request] = fetchMock.mock.calls[0];
+        expectRequest(request, {
+            body: [
+                {
+                    method: 'post',
+                    path: '/some_list/some_action/',
+                    data: { choice: 'one', text: 'Mshvill' },
+                },
+            ],
+        });
     }
 });
diff --git a/frontend_src/vstutils/store/__tests__/custom-title.test.js b/frontend_src/vstutils/store/__tests__/custom-title.test.js
index 1e7734b7..331538d5 100644
--- a/frontend_src/vstutils/store/__tests__/custom-title.test.js
+++ b/frontend_src/vstutils/store/__tests__/custom-title.test.js
@@ -1,11 +1,8 @@
-import { test, expect } from '@jest/globals';
-import { createApp, createSchema, openPage } from '@/unittests';
+import { waitFor } from '@testing-library/dom';
+import { createApp, createSchema } from '@/unittests';
 import detailPageSchema from './detailPage-schema.json';
-import fetchMock from 'jest-fetch-mock';
 
 test('title customization using View.getTitle', async () => {
-    fetchMock.enableMocks();
-
     // Created schema and Model
     const app = await createApp({
         schema: createSchema(detailPageSchema),
@@ -15,12 +12,9 @@ test('title customization using View.getTitle', async () => {
 
     userDetailView.getTitle = (state) => (state?.instance ? `User: ${state.instance.id}` : 'User');
 
-    await openPage('/user/1337/');
-    expect(app.store.title).toBe('User');
-
     fetchMock.mockResponseOnce(JSON.stringify([{ status: 200, data: { id: 1337, username: 'Msh' } }]));
-    await app.store.page.fetchData();
-
-    expect(app.store.title).toBe('User: 1337');
+    await app.router.push('/user/1337/');
+    expect(app.store.title).toBe('User');
+    await waitFor(() => expect(app.store.title).toBe('User: 1337'));
     expect(app.store.breadcrumbs.at(-1).name).toBe('User: 1337');
-}, 9999);
+});
diff --git a/frontend_src/vstutils/store/__tests__/deep-nested.test.js b/frontend_src/vstutils/store/__tests__/deep-nested.test.js
index 8d3ae8aa..21cb6266 100644
--- a/frontend_src/vstutils/store/__tests__/deep-nested.test.js
+++ b/frontend_src/vstutils/store/__tests__/deep-nested.test.js
@@ -1,8 +1,7 @@
-import { beforeAll, expect, test } from '@jest/globals';
-import fetchMock from 'jest-fetch-mock';
 import { createApp } from '@/unittests/create-app';
 import { createSchema } from '@/unittests/schema';
 import deepNestedSchema from './deep-nested-schema.json';
+import { waitFor } from '@testing-library/dom';
 
 let app;
 
@@ -10,15 +9,9 @@ beforeAll(async () => {
     app = await createApp({
         schema: createSchema(deepNestedSchema),
     });
-    fetchMock.enableMocks();
 });
 
 test('filtering of deep nested on root page', async () => {
-    const view = app.views.get('/group/');
-    const store = view._createStore();
-    await app.router.push('/group/');
-    await app.store.setPage(store);
-
     fetchMock.mockResponseOnce(
         JSON.stringify([
             {
@@ -32,9 +25,9 @@ test('filtering of deep nested on root page', async () => {
             },
         ]),
     );
-    await store.fetchData();
-
-    const [, request] = fetchMock.mock.calls[0];
-    const body = JSON.parse(request.body);
+    await app.router.push('/group/');
+    await waitFor(() => expect(fetchMock).toBeCalledTimes(1));
+    const [request] = fetchMock.mock.calls[0];
+    const body = JSON.parse(request.body.toString());
     expect(new URLSearchParams(body[0].query).get('__deep_parent')).toBe('');
 });
diff --git a/frontend_src/vstutils/store/__tests__/detailPage.test.js b/frontend_src/vstutils/store/__tests__/detailPage.test.js
index 800ae6cb..257914be 100644
--- a/frontend_src/vstutils/store/__tests__/detailPage.test.js
+++ b/frontend_src/vstutils/store/__tests__/detailPage.test.js
@@ -1,13 +1,16 @@
-import { test, expect, beforeAll, beforeEach } from '@jest/globals';
-import fetchMock from 'jest-fetch-mock';
 import moment from 'moment';
-import { createApp } from '@/unittests/create-app';
-import { createSchema } from '@/unittests/schema';
+import {
+    createApp,
+    createSchema,
+    expectRequest,
+    fetchMockCallAt,
+    waitFor,
+    waitForPageLoading,
+} from '@/unittests';
 import detailPageSchema from './detailPage-schema.json';
 import putDetailPageSchema from './putDetailPage-schema.json';
 
 beforeAll(() => {
-    fetchMock.enableMocks();
     moment.tz.guess = () => 'UTC';
 });
 
@@ -21,18 +24,6 @@ test('createDetailViewStore', async () => {
         schema: createSchema(detailPageSchema),
     });
 
-    const detailView = app.views.get('/some_list/{id}/');
-
-    // Create store for detailView
-    const store = detailView._createStore();
-    expect(store).not.toBeNull();
-
-    // Push our path to router
-    app.router.push('/some_list/15/');
-    app.store.setPage(store);
-
-    expect(store.response).toBeFalsy();
-
     // Mock response with empty results and make sure that response is received
     fetchMock.mockResponseOnce(
         JSON.stringify([
@@ -47,54 +38,37 @@ test('createDetailViewStore', async () => {
             },
         ]),
     );
-    await store.fetchData();
 
-    expect(store.response).toBeTruthy();
-    expect(store.loading).toBeFalsy();
-    expect(store.instance._getInnerData()).toStrictEqual({
+    // Push our path to router
+    await app.router.push('/some_list/15/');
+    await waitForPageLoading();
+
+    expectRequest(fetchMockCallAt(0), {
+        body: [{ method: 'get', path: ['some_list', '15'] }],
+    });
+
+    expect(app.store.page.response).toBeTruthy();
+    expect(app.store.page.loading).toBeFalsy();
+    expect(app.store.page.instance._getInnerData()).toStrictEqual({
         id: 15,
         name: 'NewShop',
         active: true,
         phone: '79658964562',
     });
 
-    fetchMock.resetMocks();
-    fetchMock.mockResponseOnce(
-        JSON.stringify([
-            {
-                data: {
-                    id: 15,
-                    name: 'Shop',
-                    active: true,
-                    phone: '79658964562',
-                    some_number: 18,
-                },
-                status: 200,
-            },
-        ]),
-    );
-    await store.fetchData();
-
-    let [, request] = fetchMock.mock.calls[0];
-    let bulk = JSON.parse(request.body);
-    expect(bulk[0].method).toBe('get');
-    expect(bulk[0].path).toStrictEqual(['some_list', 15]);
-    expect(bulk[0].query).toBeUndefined();
-
     // Check actions and sublinks
-    expect(store.actions.length).toBe(1);
-    expect(store.actions[0].name).toEqual('remove');
+    expect(app.store.page.actions.length).toBe(1);
+    expect(app.store.page.actions[0].name).toEqual('remove');
 
-    expect(store.sublinks.length).toBe(1);
-    expect(store.sublinks[0].name).toEqual('edit');
+    expect(app.store.page.sublinks.length).toBe(1);
+    expect(app.store.page.sublinks[0].name).toEqual('edit');
 
     fetchMock.resetMocks();
     fetchMock.mockResponseOnce('{}', { status: 204 });
-    await store.removeInstance({ instance: store.instance, fromList: false, purge: false });
-    [, request] = fetchMock.mock.calls[0];
-    bulk = JSON.parse(request.body);
-    expect(bulk[0].method).toBe('delete');
-    expect(bulk[0].path).toStrictEqual(['some_list', 15]);
+    await app.store.page.removeInstance({ instance: app.store.page.instance, fromList: false, purge: false });
+    expectRequest(fetchMockCallAt(0), {
+        body: [{ method: 'delete', path: ['some_list', 15] }],
+    });
 });
 
 test('createEditViewStore', async () => {
@@ -102,18 +76,6 @@ test('createEditViewStore', async () => {
         schema: createSchema(detailPageSchema),
     });
 
-    const editView = app.views.get('/some_list/{id}/edit/');
-
-    const store = editView._createStore();
-    expect(store).not.toBeNull();
-
-    // Push our path to router
-    await app.router.push('/some_list/16/edit');
-    await app.store.setPage(store);
-
-    expect(store.response).toBeFalsy();
-
-    // Mock response with empty results and make sure that response is received
     fetchMock.mockResponseOnce(
         JSON.stringify([
             {
@@ -127,26 +89,27 @@ test('createEditViewStore', async () => {
             },
         ]),
     );
-    await store.fetchData();
+    await app.router.push('/some_list/16/edit');
+    await waitForPageLoading();
 
-    expect(store.response).toBeTruthy();
-    expect(store.loading).toBeFalsy();
-    expect(store.instance._data).toStrictEqual({
+    expect(app.store.page.response).toBeTruthy();
+    expect(app.store.page.loading).toBeFalsy();
+    expect(app.store.page.instance._data).toStrictEqual({
         id: 15,
         name: 'NewShop',
         active: true,
         phone: '79658964562',
     });
 
-    expect(store.actions.length).toBe(3);
-    expect(store.actions[0].name).toEqual('save');
-    expect(store.actions[1].name).toEqual('reload');
-    expect(store.actions[2].name).toEqual('cancel');
+    expect(app.store.page.actions.length).toBe(3);
+    expect(app.store.page.actions[0].name).toEqual('save');
+    expect(app.store.page.actions[1].name).toEqual('reload');
+    expect(app.store.page.actions[2].name).toEqual('cancel');
 
     fetchMock.resetMocks();
 
     // Change field value
-    store.setFieldValue({ field: 'name', value: 'new name' });
+    app.store.page.setFieldValue({ field: 'name', value: 'new name' });
 
     fetchMock.mockResponseOnce(
         JSON.stringify([
@@ -156,13 +119,13 @@ test('createEditViewStore', async () => {
             },
         ]),
     );
-    await store.reload();
-    let [, request] = fetchMock.mock.calls[0];
-    let bulk = JSON.parse(request.body);
-    expect(bulk[0].method).toBe('get');
-    expect(bulk[0].path).toStrictEqual(['some_list', 15]);
-    // Field must be reset after reloading
-    expect(store.sandbox.name).toBe('NewShop');
+    await app.store.page.reload();
+
+    await waitFor(() => expect(fetchMock.mock.calls.length).toBe(1));
+    expectRequest(fetchMockCallAt(0), {
+        body: [{ method: 'get', path: ['some_list', 15] }],
+    });
+    expect(app.store.page.sandbox.name).toBe('NewShop');
 });
 
 test('patchEditViewStore', async () => {
@@ -170,12 +133,6 @@ test('patchEditViewStore', async () => {
         schema: createSchema(detailPageSchema),
     });
 
-    const editView = app.views.get('/some_list/{id}/edit/');
-
-    const store = editView._createStore();
-    await app.router.push('/some_list/17/edit');
-    await app.store.setPage(store);
-
     fetchMock.mockResponseOnce(
         JSON.stringify([
             {
@@ -189,7 +146,8 @@ test('patchEditViewStore', async () => {
             },
         ]),
     );
-    await store.fetchData();
+    await app.router.push('/some_list/17/edit');
+    await waitForPageLoading();
 
     fetchMock.resetMocks();
     fetchMock.mockResponseOnce(
@@ -206,16 +164,14 @@ test('patchEditViewStore', async () => {
         ]),
     );
 
-    store.setFieldValue({ field: 'name', value: 'Shop' });
-    expect(store.sandbox.name).toEqual('Shop');
-    await store.save();
+    app.store.page.setFieldValue({ field: 'name', value: 'Shop' });
+    expect(app.store.page.sandbox.name).toEqual('Shop');
+    await app.store.page.save();
 
     // Check request
-    let [, request] = fetchMock.mock.calls[0];
-    let bulk = JSON.parse(request.body);
-    expect(bulk[0].method).toBe('patch');
-    expect(bulk[0].path).toStrictEqual(['some_list', 15]);
-    expect(bulk[0].data).toStrictEqual({ name: 'Shop' });
+    expectRequest(fetchMockCallAt(0), {
+        body: [{ method: 'patch', path: ['some_list', 15], data: { name: 'Shop' } }],
+    });
 });
 
 test('putEditViewStore', async () => {
@@ -223,12 +179,6 @@ test('putEditViewStore', async () => {
         schema: createSchema(putDetailPageSchema),
     });
 
-    const editView = app.views.get('/some_list/{id}/edit/');
-
-    const store = editView._createStore();
-    await app.router.push('/some_list/15/edit');
-    await app.store.setPage(store);
-
     fetchMock.mockResponseOnce(
         JSON.stringify([
             {
@@ -242,34 +192,22 @@ test('putEditViewStore', async () => {
             },
         ]),
     );
-    await store.fetchData();
 
-    fetchMock.resetMocks();
-    fetchMock.mockResponseOnce(
-        JSON.stringify([
-            {
-                data: {
-                    id: 15,
-                    name: 'Shop',
-                    active: true,
-                    phone: '79658964562',
-                },
-                status: 200,
-            },
-        ]),
-    );
+    await app.router.push('/some_list/15/edit');
+
+    await waitForPageLoading();
+
+    const store = app.store.page;
 
     store.setFieldValue({ field: 'name', value: 'Shop' });
     expect(store.sandbox.name).toEqual('Shop');
     await store.save();
 
-    let [, request] = fetchMock.mock.calls[0];
-    let bulk = JSON.parse(request.body);
-    expect(bulk[0].method).toBe('put');
-    expect(bulk[0].path).toStrictEqual(['some_list', 15]);
-    expect(bulk[0].data).toStrictEqual({
-        name: 'Shop',
-        phone: '79658964562',
+    expectRequest(fetchMockCallAt(-1), {
+        body: [
+            { method: 'put', path: ['some_list', 15], data: { name: 'Shop', phone: '79658964562' } },
+            { method: 'get', path: ['some_list', 15] },
+        ],
     });
 });
 
@@ -278,24 +216,17 @@ test('createNewViewStore', async () => {
         schema: createSchema(detailPageSchema),
     });
 
-    const newView = app.views.get('/some_list/new/');
-    const store = newView._createStore();
-    expect(store).not.toBeNull();
-    expect(store.model.name).toEqual('OneSomePage');
-
     await app.router.push('/some_list/new/');
-    await app.store.setPage(store);
-    expect(store.response).toBeFalsy();
+    await waitForPageLoading();
 
-    expect(store.sandbox).toStrictEqual({});
-    await store.fetchData();
-    expect(store.sandbox).toStrictEqual({
+    expect(app.store.page.sandbox).toStrictEqual({
         active: false,
         id: undefined,
         name: undefined,
         phone: '78005553535',
     });
 
+    fetchMock.resetMocks();
     fetchMock.mockResponseOnce(
         JSON.stringify([
             {
@@ -310,17 +241,21 @@ test('createNewViewStore', async () => {
         ]),
     );
 
-    store.setFieldValue({ field: 'name', value: 'Shop' });
-    store.setFieldValue({ field: 'active', value: true });
-    store.setFieldValue({ field: 'phone', value: '79586545544' });
-    expect(store.sandbox.active).toEqual(true);
-    expect(store.sandbox.name).toEqual('Shop');
-    expect(store.sandbox.phone).toEqual('79586545544');
-    await store.save();
+    app.store.page.setFieldValue({ field: 'name', value: 'Shop' });
+    app.store.page.setFieldValue({ field: 'active', value: true });
+    app.store.page.setFieldValue({ field: 'phone', value: '79586545544' });
+    expect(app.store.page.sandbox.active).toEqual(true);
+    expect(app.store.page.sandbox.name).toEqual('Shop');
+    expect(app.store.page.sandbox.phone).toEqual('79586545544');
+    await app.store.page.save();
 
-    let [, request] = fetchMock.mock.calls[0];
-    let bulk = JSON.parse(request.body);
-    expect(bulk[0].method).toBe('post');
-    expect(bulk[0].path).toStrictEqual(['some_list']);
-    expect(bulk[0].data).toStrictEqual({ active: true, name: 'Shop', phone: '79586545544' });
+    expectRequest(fetchMockCallAt(0), {
+        body: [
+            {
+                method: 'post',
+                path: ['some_list'],
+                data: { active: true, name: 'Shop', phone: '79586545544' },
+            },
+        ],
+    });
 });
diff --git a/frontend_src/vstutils/store/__tests__/detailPageFilters.test.js b/frontend_src/vstutils/store/__tests__/detailPageFilters.test.js
index ce6f2a71..ea4d2992 100644
--- a/frontend_src/vstutils/store/__tests__/detailPageFilters.test.js
+++ b/frontend_src/vstutils/store/__tests__/detailPageFilters.test.js
@@ -1,24 +1,12 @@
-import { test, expect, beforeAll, beforeEach } from '@jest/globals';
-import fetchMock from 'jest-fetch-mock';
-import { createApp } from '@/unittests/create-app';
-import { createSchema } from '@/unittests/schema';
+import { waitForPageLoading, createApp, createSchema } from '@/unittests';
 import schema from './detailPageFilters-schema.json';
 
-beforeAll(() => {
-    fetchMock.enableMocks();
-});
-
 beforeEach(() => {
     fetchMock.resetMocks();
 });
 
 test('detail page filters', async () => {
     const app = await createApp({ schema: createSchema(schema) });
-    const view = app.views.get('/page/{id}/');
-    const store = view._createStore();
-
-    app.router.push('/page/1/');
-    app.store.setPage(store);
 
     fetchMock.mockResponseOnce(
         JSON.stringify([
@@ -34,23 +22,24 @@ test('detail page filters', async () => {
             },
         ]),
     );
-    await store.fetchData();
+    await app.router.push('/page/1/');
+    await waitForPageLoading();
 
-    expect(store.instance._getInnerData()).toStrictEqual({
+    expect(app.store.page.instance._getInnerData()).toStrictEqual({
         id: 1,
         name: 'name',
     });
-    expect(Object.keys(store.filters).length).toStrictEqual(2);
-    expect(store.appliedDefaultFilterNames).toStrictEqual(['date_filter', 'boolean_filter']);
-    expect(store.filtersQuery).toStrictEqual({});
-    expect(store.filters).toStrictEqual({ date_filter: '2001-11-01', boolean_filter: 'false' });
+    expect(Object.keys(app.store.page.filters).length).toStrictEqual(2);
+    expect(app.store.page.appliedDefaultFilterNames).toStrictEqual(['date_filter', 'boolean_filter']);
+    expect(app.store.page.filtersQuery).toStrictEqual({});
+    expect(app.store.page.filters).toStrictEqual({ date_filter: '2001-11-01', boolean_filter: 'false' });
 
-    store.applyFilters({ string_filter: 'string', boolean_filter: true, date_filter: '2001-11-01' });
-    await store.fetchData();
+    app.store.page.applyFilters({ string_filter: 'string', boolean_filter: true, date_filter: '2001-11-01' });
+    await app.store.page.fetchData();
 
-    expect(store.appliedDefaultFilterNames).toStrictEqual([]);
+    expect(app.store.page.appliedDefaultFilterNames).toStrictEqual([]);
 
     let expectedInner = { string_filter: 'string', boolean_filter: 'true', date_filter: '2001-11-01' };
-    expect(store.filtersQuery).toStrictEqual(expectedInner);
-    expect(store.filters).toStrictEqual(expectedInner);
+    expect(app.store.page.filtersQuery).toStrictEqual(expectedInner);
+    expect(app.store.page.filters).toStrictEqual(expectedInner);
 });
diff --git a/frontend_src/vstutils/store/__tests__/helpers.test.js b/frontend_src/vstutils/store/__tests__/helpers.test.js
index d68c042f..12cad666 100644
--- a/frontend_src/vstutils/store/__tests__/helpers.test.js
+++ b/frontend_src/vstutils/store/__tests__/helpers.test.js
@@ -1,4 +1,3 @@
-import { test, beforeAll, expect } from '@jest/globals';
 import { ref } from 'vue';
 import { createApp } from '../../../unittests/create-app';
 import { createSchema } from '../../../unittests/schema';
diff --git a/frontend_src/vstutils/store/__tests__/localSettings.test.js b/frontend_src/vstutils/store/__tests__/localSettings.test.js
index 44c0dcab..235a231b 100644
--- a/frontend_src/vstutils/store/__tests__/localSettings.test.js
+++ b/frontend_src/vstutils/store/__tests__/localSettings.test.js
@@ -1,4 +1,3 @@
-import { expect, test } from '@jest/globals';
 import { makeModel, BaseModel } from '@/vstutils/models';
 import { StringField } from '@/vstutils/fields/text';
 import { IntegerField } from '@/vstutils/fields/numbers/integer';
diff --git a/frontend_src/vstutils/store/__tests__/modules.test.js b/frontend_src/vstutils/store/__tests__/modules.test.js
index 42bafa10..19584ea3 100644
--- a/frontend_src/vstutils/store/__tests__/modules.test.js
+++ b/frontend_src/vstutils/store/__tests__/modules.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe, beforeAll } from '@jest/globals';
 import { createApp, createSchema, openPage } from '@/unittests';
 
 describe('List store module', () => {
diff --git a/frontend_src/vstutils/store/__tests__/page.test.js b/frontend_src/vstutils/store/__tests__/page.test.js
index ffc15737..69c21c51 100644
--- a/frontend_src/vstutils/store/__tests__/page.test.js
+++ b/frontend_src/vstutils/store/__tests__/page.test.js
@@ -1,42 +1,27 @@
-import { test, expect, beforeAll } from '@jest/globals';
 import { ref } from 'vue';
-import { createApp } from '../../../unittests/create-app';
-import { createSchema } from '../../../unittests/schema';
-import fetchMock from 'jest-fetch-mock';
+import { waitFor } from '@testing-library/dom';
+import { expectNthRequest, createApp, createSchema } from '@/unittests';
 import { useSelection } from '../helpers';
 import pageSchema from './page-schema.json';
 
-beforeAll(() => {
-    fetchMock.enableMocks();
-});
-
 test('createListViewStore', async () => {
     // Created schema and Model
     const app = await createApp({
         schema: createSchema(pageSchema),
     });
 
-    const listView = app.views.get('/some_list/');
-
-    // Get store for view and make sure that store is created, and it isn't null
-    const store = listView._createStore();
-    expect(store).not.toBeNull();
-
-    // Push our path to router
-    await app.router.push('/some_list/');
-    await app.store.setPage(store);
-
-    expect(store.response).toBeFalsy();
-
-    // Mock response with empty results and make sure that response is received
     fetchMock.mockResponseOnce(
         JSON.stringify([{ status: 200, data: { count: 0, next: null, previous: null, results: [] } }]),
     );
-    await store.fetchData();
+    app.router.push('/some_list/');
+
+    expect(app.store.page.response).toBeFalsy();
 
-    expect(store.response).toBeTruthy();
-    expect(store.loading).toBeFalsy();
-    expect(store.instances.length).toBe(0);
+    await waitFor(() => expect(fetchMock).toBeCalledTimes(1));
+
+    expect(app.store.page.response).toBeTruthy();
+    expect(app.store.page.loading).toBeFalsy();
+    expect(app.store.page.instances.length).toBe(0);
 
     const data = JSON.stringify([
         {
@@ -71,10 +56,10 @@ test('createListViewStore', async () => {
 
     // Mock response with results
     fetchMock.mockResponseOnce(data);
-    await store.fetchData();
+    await app.store.page.fetchData();
 
-    expect(store.instances.length).toBe(3);
-    expect(store.instances[0]._data).toStrictEqual({
+    expect(app.store.page.instances.length).toBe(3);
+    expect(app.store.page.instances[0]._data).toStrictEqual({
         id: 5,
         store: 'LolShop',
         status: 'PAID',
@@ -82,31 +67,30 @@ test('createListViewStore', async () => {
     });
 
     // Check that instance on listView is selected
-    const selection = useSelection(ref(store.instances));
+    const selection = useSelection(ref(app.store.page.instances));
     selection.toggleSelection(5);
     expect(selection.selection.value).toStrictEqual([5]);
     selection.toggleSelection(5);
 
     // Check sublinks, actions and multiActions.
-    expect(store.sublinks).toStrictEqual([]);
+    expect(app.store.page.sublinks).toStrictEqual([]);
     // Actions must have filters action.
-    expect(store.actions.length).toBe(1);
-    expect(store.actions[0].name).toStrictEqual('filters');
+    expect(app.store.page.actions.length).toBe(1);
+    expect(app.store.page.actions[0].name).toStrictEqual('filters');
     // MultiActions must have remove action.
-    expect(store.multiActions.length).toBe(1);
-    expect(store.multiActions[0].name).toStrictEqual('remove');
+    expect(app.store.page.multiActions.length).toBe(1);
+    expect(app.store.page.multiActions[0].name).toStrictEqual('remove');
 
     // Check pagination
-    expect(store.count).toBe(3);
-    expect(store.pageNumber).toBe(1);
+    expect(app.store.page.count).toBe(3);
+    expect(app.store.page.pageNumber).toBe(1);
 
     // Check query params
     app.router.push('/some_list/?page=2');
-    await store.fetchData();
-    expect(store.filters).toStrictEqual({ page: '2' });
+    await app.store.page.fetchData();
+    expect(app.store.page.filters).toStrictEqual({ page: '2' });
 
     fetchMock.resetMocks();
-    app.router.push('/some_list/?id=3&name=MshShop');
     fetchMock.mockResponseOnce(
         JSON.stringify([
             {
@@ -127,29 +111,49 @@ test('createListViewStore', async () => {
             },
         ]),
     );
-    await store.fetchData();
-    expect(store.error).toBeFalsy();
-    expect(store.instances.length).toBe(1);
-
-    let [, request] = fetchMock.mock.calls[0];
-    let bulk = JSON.parse(request.body);
-    expect(bulk[0].method).toBe('get');
-    expect(bulk[0].path).toStrictEqual(['some_list']);
-    expect(bulk[0].query).toBe('limit=20&offset=0&id=3&name=MshShop');
+    app.router.push('/some_list/?id=3&name=MshShop');
+    await waitFor(() => expect(fetchMock).toBeCalledTimes(1));
+    expect(app.store.page.error).toBeFalsy();
+    expect(app.store.page.instances.length).toBe(1);
+
+    expectNthRequest(0, {
+        method: 'PUT',
+        url: 'http://localhost/api/endpoint/',
+        body: [
+            {
+                method: 'get',
+                path: ['some_list'],
+                query: 'limit=20&offset=0&id=3&name=MshShop',
+            },
+        ],
+    });
 
     // Check delete instance
     fetchMock.resetMocks();
     fetchMock.mockResponseOnce('{}', { status: 204 });
-    await store.removeInstance({ instance: store.instances[0], fromList: true, purge: true });
-    [, request] = fetchMock.mock.calls[0];
-    bulk = JSON.parse(request.body);
-    expect(bulk[0].method).toBe('delete');
-    expect(bulk[0].path).toStrictEqual(['some_list', 3]);
+    await app.store.page.removeInstance({
+        instance: app.store.page.instances[0],
+        fromList: true,
+        purge: true,
+    });
+    expectNthRequest(0, {
+        method: 'PUT',
+        url: 'http://localhost/api/endpoint/',
+        body: [
+            {
+                method: 'delete',
+                path: ['some_list', 3],
+                headers: {
+                    'X-Purge-Nested': 'true',
+                },
+            },
+        ],
+    });
 
     // Check delete instances
     fetchMock.resetMocks();
     fetchMock.mockResponseOnce(data);
-    await store.fetchData();
+    await app.store.page.fetchData();
 
     fetchMock.resetMocks();
     fetchMock.mockResponseOnce(
@@ -158,10 +162,28 @@ test('createListViewStore', async () => {
             { headers: '{}', status: 204 },
         ]),
     );
-    await store.removeInstances({ instances: [store.instances[0], store.instances[1]], purge: true });
-    [, request] = fetchMock.mock.calls[0];
-    bulk = JSON.parse(request.body);
-    expect(bulk[0].method).toBe('delete');
-    expect(bulk[0].path).toStrictEqual(['some_list', 5]);
-    expect(bulk[1].path).toStrictEqual(['some_list', 2]);
+    await app.store.page.removeInstances({
+        instances: [app.store.page.instances[0], app.store.page.instances[1]],
+        purge: true,
+    });
+    expectNthRequest(0, {
+        method: 'PUT',
+        url: 'http://localhost/api/endpoint/',
+        body: [
+            {
+                method: 'delete',
+                path: ['some_list', 5],
+                headers: {
+                    'X-Purge-Nested': 'true',
+                },
+            },
+            {
+                method: 'delete',
+                path: ['some_list', 2],
+                headers: {
+                    'X-Purge-Nested': 'true',
+                },
+            },
+        ],
+    });
 });
diff --git a/frontend_src/vstutils/store/__tests__/prefetch-with-provided-instance.test.js b/frontend_src/vstutils/store/__tests__/prefetch-with-provided-instance.test.js
index f1b6ba89..cbdc7eb9 100644
--- a/frontend_src/vstutils/store/__tests__/prefetch-with-provided-instance.test.js
+++ b/frontend_src/vstutils/store/__tests__/prefetch-with-provided-instance.test.js
@@ -1,26 +1,14 @@
-import { beforeAll, expect, test } from '@jest/globals';
-import fetchMock from 'jest-fetch-mock';
 import { createApp } from '@/unittests/create-app';
-import { createSchema } from '@/unittests/schema';
+import { createSchema, expectRequest, fetchMockCallAt, waitFor } from '@/unittests';
 import schema from './prefetch-with-provided-instance-schema.json';
 
-let app;
-
-beforeAll(async () => {
-    app = await createApp({ schema: createSchema(schema) });
-    fetchMock.enableMocks();
-});
-
 test('prefetch with provided instance', async () => {
+    const app = await createApp({ schema: createSchema(schema) });
     const view = app.views.get('/some/{id}/');
-    const store = view._createStore();
 
     const Some = app.modelsResolver.get('Some');
     const providedInstance = new Some({ id: 123, name: 'test', related: 456 }, view.objects);
 
-    await app.router.push({ name: '/some/{id}/', params: { id: 123, providedInstance } });
-    await app.store.setPage(store);
-
     fetchMock.mockResponseOnce(
         JSON.stringify([
             {
@@ -39,16 +27,20 @@ test('prefetch with provided instance', async () => {
             },
         ]),
     );
-    await store.fetchData();
 
-    // Expected 1 request to prefetch related object with id 456
+    app.router.push({ name: '/some/{id}/', params: { id: 123, providedInstance } });
 
-    expect(fetchMock.mock.calls.length).toBe(1);
-    const [, request] = fetchMock.mock.calls[0];
-    const body = JSON.parse(request.body);
-    expect(body.length).toBe(1);
-    expect(body[0].path).toStrictEqual(['related']);
-    expect(body[0].query).toBe('id=456&limit=1');
-    expect(store.sandbox.related).toBeInstanceOf(app.modelsResolver.get('Related'));
-    expect(store.sandbox.related.name).toBe('related object');
+    // Expected 1 request to prefetch related object with id 456
+    await waitFor(() => expect(fetchMock.mock.calls.length).toBe(1));
+    expectRequest(fetchMockCallAt(0), {
+        body: [
+            {
+                method: 'get',
+                path: ['related'],
+                query: 'id=456&limit=1',
+            },
+        ],
+    });
+    expect(app.store.page.sandbox.related).toBeInstanceOf(app.modelsResolver.get('Related'));
+    expect(app.store.page.sandbox.related.name).toBe('related object');
 });
diff --git a/frontend_src/vstutils/store/__tests__/useParentViews.test.js b/frontend_src/vstutils/store/__tests__/useParentViews.test.js
index a28d322c..aa21a038 100644
--- a/frontend_src/vstutils/store/__tests__/useParentViews.test.js
+++ b/frontend_src/vstutils/store/__tests__/useParentViews.test.js
@@ -1,4 +1,3 @@
-import { expect, test, beforeAll, jest } from '@jest/globals';
 import { createApp } from '@/unittests/create-app';
 import { createSchema } from '@/unittests/schema';
 import { useParentViews } from '../helpers';
@@ -10,15 +9,16 @@ beforeAll(async () => {
 });
 
 test('useParentViews', async () => {
-    const { items, itemsMap, push } = useParentViews();
+    let currentPath = '';
+    const { items, itemsMap, push } = useParentViews({ getPath: () => currentPath });
 
     const usersView = app.views.get('/user/');
-    usersView.resolveState = jest.fn(() => Promise.resolve());
+    usersView.resolveState = vitest.fn(() => Promise.resolve());
 
     const userView = app.views.get('/user/{id}/');
-    userView.resolveState = jest.fn(() => Promise.resolve());
+    userView.resolveState = vitest.fn(() => Promise.resolve());
 
-    await app.router.push('/user/1337/');
+    currentPath = '/user/1337/';
     await push(userView._createStore());
     expect(items.value.length).toBe(2);
     expect(itemsMap.value.get('/user/')).toBe(items.value[0]);
@@ -27,7 +27,7 @@ test('useParentViews', async () => {
     expect(usersView.resolveState).toBeCalledTimes(1);
     expect(userView.resolveState).toBeCalledTimes(1);
 
-    await app.router.push('/user/123/');
+    currentPath = '/user/123/';
     await push(userView._createStore());
     expect(items.value.length).toBe(2);
     expect(itemsMap.value.get('/user/')).toBe(items.value[0]);
diff --git a/frontend_src/vstutils/store/helpers.ts b/frontend_src/vstutils/store/helpers.ts
index 34d13e38..8834628b 100644
--- a/frontend_src/vstutils/store/helpers.ts
+++ b/frontend_src/vstutils/store/helpers.ts
@@ -45,7 +45,7 @@ import type { RepresentData, InnerData } from '@/vstutils/utils';
 import type { BaseViewStore } from './page-types';
 import type { SetFieldValueOptions } from '../fields/base';
 
-export function useParentViews() {
+export function useParentViews(params?: { getPath?: () => string }) {
     interface Item {
         view: IView;
         state: unknown;
@@ -55,10 +55,12 @@ export function useParentViews() {
     const items = ref<Item[]>([]);
     const itemsMap = computed(() => new Map(items.value.map((item) => [item.view.path, item])));
 
+    const getPath = params?.getPath ?? (() => getApp().router.currentRoute.path);
+
     async function push(store: BaseViewStore): Promise<void> {
         const view = store.view;
         const router = getApp().router;
-        const path = router.currentRoute.path;
+        const path = getPath();
 
         const promises: Promise<Item>[] = [];
 
@@ -269,7 +271,7 @@ export function filterNonEmpty(obj: Record<string, any>) {
 export function useListFilters(qs: Ref<QuerySet>) {
     const app = getApp();
     const count = ref(0);
-    const pageSize = ref(app.config.defaultPageLimit);
+    const pageSize = ref(app.defaultPageLimit);
     const pageNumber = ref(1);
     const filters = ref<InnerData>(emptyInnerData());
 
diff --git a/frontend_src/vstutils/store/index.ts b/frontend_src/vstutils/store/index.ts
index 9b544c3a..cee92929 100644
--- a/frontend_src/vstutils/store/index.ts
+++ b/frontend_src/vstutils/store/index.ts
@@ -1,19 +1,10 @@
 import { createPinia } from 'pinia';
-import { GLOBAL_STORE, GlobalStore } from './globalStore';
-import { createLocalSettingsStore, LocalSettingsStore } from './localSettingsStore';
-import { createUserSettingsStore, UserSettingsStore } from './userSettingsStore';
+export { GLOBAL_STORE, type GlobalStore } from './globalStore';
+export { createLocalSettingsStore, type LocalSettingsStore } from './localSettingsStore';
+export { createUserSettingsStore, type UserSettingsStore } from './userSettingsStore';
 
 export * from './page';
 export * from './page-types';
 export * from './helpers';
 
-export {
-    GLOBAL_STORE,
-    createLocalSettingsStore,
-    createUserSettingsStore,
-    LocalSettingsStore,
-    UserSettingsStore,
-    GlobalStore,
-};
-
 export const pinia = createPinia();
diff --git a/frontend_src/vstutils/store/userSettingsStore.ts b/frontend_src/vstutils/store/userSettingsStore.ts
index a70b7cc1..ade284e2 100644
--- a/frontend_src/vstutils/store/userSettingsStore.ts
+++ b/frontend_src/vstutils/store/userSettingsStore.ts
@@ -55,7 +55,7 @@ export const createUserSettingsStore = (api: ApiConnector, modelClass: ModelCons
             return save();
         }
         async function init() {
-            const { data } = await api.bulkQuery<InnerData<Settings>>({
+            const { data } = await api.makeRequest<InnerData<Settings>>({
                 method: HttpMethods.GET,
                 path: USER_SETTINGS_PATH,
             });
diff --git a/frontend_src/vstutils/translation.ts b/frontend_src/vstutils/translation.ts
index 4549f7df..bbd674ec 100644
--- a/frontend_src/vstutils/translation.ts
+++ b/frontend_src/vstutils/translation.ts
@@ -1,6 +1,7 @@
+import Vue from 'vue';
 import VueI18n from 'vue-i18n';
 import '../libs/vue.js';
-import { getCookie, capitalize } from './utils/todo';
+import { getCookie, capitalize } from './utils';
 
 export const RUPluralizationRule = (choice: number, choicesLength: number) => {
     if (choice === 0) {
@@ -60,12 +61,18 @@ VueI18n.prototype.ts = function ts(key: VueI18n.Path, values?: VueI18n.Values):
     return String(this.t(key, values));
 };
 
-export const i18n = new VueI18n({
-    locale: document.documentElement.lang || getCookie('lang') || 'en',
-    messages: {},
-    silentTranslationWarn: true,
-    formatFallbackMessages: true,
-    pluralizationRules: {
-        ru: RUPluralizationRule,
-    },
-});
+export function createVueI18n() {
+    return new VueI18n({
+        locale: document.documentElement.lang || getCookie('lang') || 'en',
+        messages: {},
+        silentTranslationWarn: true,
+        formatFallbackMessages: true,
+        pluralizationRules: {
+            ru: RUPluralizationRule,
+        },
+    });
+}
+
+Vue.use(VueI18n);
+
+export const i18n = createVueI18n();
diff --git a/frontend_src/vstutils/users/index.js b/frontend_src/vstutils/users/index.js
index 15bf6ddb..e094225a 100644
--- a/frontend_src/vstutils/users/index.js
+++ b/frontend_src/vstutils/users/index.js
@@ -87,7 +87,7 @@ signals.once('allViews.created', ({ views }) => {
             const secret = store.sandbox.value.secret;
             if (secret) {
                 const username = app.user.getViewFieldValue();
-                return `otpauth://totp/${app.config.projectName}:${username}?secret=${secret}`;
+                return `otpauth://totp/${app.projectName}:${username}?secret=${secret}`;
             }
             return null;
         });
diff --git a/frontend_src/vstutils/utils/__tests__/utils.test.js b/frontend_src/vstutils/utils/__tests__/utils.test.js
index fd32d2bb..36f5b297 100644
--- a/frontend_src/vstutils/utils/__tests__/utils.test.js
+++ b/frontend_src/vstutils/utils/__tests__/utils.test.js
@@ -1,4 +1,3 @@
-import { jest, expect, test, describe, beforeAll } from '@jest/globals';
 import {
     capitalize,
     chunkArray,
@@ -167,12 +166,12 @@ describe('utils', () => {
     });
 
     test('randomSleep', async () => {
-        jest.useFakeTimers();
-        const callback = jest.fn();
+        vitest.useFakeTimers();
+        const callback = vitest.fn();
         const promise = randomSleep(500, 600).then(callback);
-        jest.advanceTimersByTime(499);
+        vitest.advanceTimersByTime(499);
         expect(callback).not.toBeCalled();
-        jest.advanceTimersByTime(600);
+        vitest.advanceTimersByTime(600);
         await promise;
         expect(callback).toBeCalledTimes(1);
     });
diff --git a/frontend_src/vstutils/utils/index.ts b/frontend_src/vstutils/utils/index.ts
index ae485230..a31c2804 100644
--- a/frontend_src/vstutils/utils/index.ts
+++ b/frontend_src/vstutils/utils/index.ts
@@ -3,7 +3,7 @@ import { getApp } from './app-helpers';
 
 import type { ParameterType } from 'swagger-schema-official';
 import type { defineStore } from 'pinia';
-import type { Field } from '../fields/base/';
+import type { Field } from '../fields/base/Field';
 import type { Route, Location } from 'vue-router';
 import type { Model, ModelConstructor } from '@/vstutils/models';
 import type { IView, PageView, Sublink } from '@/vstutils/views';
@@ -486,3 +486,34 @@ export function fitToWrapper({
 
     return { width, height };
 }
+
+export function capitalize(string: string) {
+    if (!string) return '';
+    return string.charAt(0).toUpperCase() + string.slice(1).toLowerCase();
+}
+
+export function nameToTitle(name: string) {
+    return String(name)
+        .replace(/_/g, ' ')
+        .replace(/\s{2,}/g, ' ')
+        .trim();
+}
+
+export function lower(value: string) {
+    if (!value) {
+        return '';
+    }
+    value = value.toString();
+    return value.toLowerCase();
+}
+
+export function escapeHtml(unsafe: string) {
+    return unsafe
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#039;');
+}
+
+export const OBJECT_NOT_FOUND_TEXT = '[Object not found]';
diff --git a/frontend_src/vstutils/utils/todo.js b/frontend_src/vstutils/utils/todo.js
index 615c6cf4..5e8e02ed 100644
--- a/frontend_src/vstutils/utils/todo.js
+++ b/frontend_src/vstutils/utils/todo.js
@@ -54,41 +54,6 @@ String.prototype.format_keys = function () {
     });
 };
 
-/**
- * Function returns capitalized string - first char is in UpperCase, others - in LowerCase.
- * @param {string} string String, that should be capitalized.
- * @return {string}
- */
-export function capitalize(string) {
-    if (!string) return '';
-    return string.charAt(0).toUpperCase() + string.slice(1).toLowerCase();
-}
-
-/**
- * Converts name to title
- * @param {string} name
- * @returns {string}
- */
-export function nameToTitle(name) {
-    return String(name)
-        .replace(/_/g, ' ')
-        .replace(/\s{2,}/g, ' ')
-        .trim();
-}
-
-/**
- * Lowercase value
- * @param {string} value
- * @returns {string|*}
- */
-export function lower(value) {
-    if (!value) {
-        return '';
-    }
-    value = value.toString();
-    return value.toLowerCase();
-}
-
 /**
  * Uppercase value
  * @param {string} value
@@ -843,20 +808,6 @@ export function randomSleep(min, max) {
     return sleep(getRandomInt(min, max));
 }
 
-/**
- * Escape string so it can be safe used in html
- * @param {string} unsafe
- * @return {string}
- */
-export function escapeHtml(unsafe) {
-    return unsafe
-        .replace(/&/g, '&amp;')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;')
-        .replace(/'/g, '&#039;');
-}
-
 /**
  * @param file {object}
  * @return {string}
diff --git a/frontend_src/vstutils/views/__tests__/ViewConstructor.test.js b/frontend_src/vstutils/views/__tests__/ViewConstructor.test.js
index c34aa6fd..17b242d1 100644
--- a/frontend_src/vstutils/views/__tests__/ViewConstructor.test.js
+++ b/frontend_src/vstutils/views/__tests__/ViewConstructor.test.js
@@ -1,4 +1,3 @@
-import { describe, expect, test, beforeAll } from '@jest/globals';
 import { HttpMethods, RequestTypes } from '../../utils';
 import ViewConstructor from '../ViewConstructor.js';
 import testSchema from './../../../__mocks__/testSchema.json';
diff --git a/frontend_src/vstutils/views/__tests__/actions-generation.test.js b/frontend_src/vstutils/views/__tests__/actions-generation.test.js
index 8c0e21ff..73f2d527 100644
--- a/frontend_src/vstutils/views/__tests__/actions-generation.test.js
+++ b/frontend_src/vstutils/views/__tests__/actions-generation.test.js
@@ -1,4 +1,3 @@
-import { expect, test, describe } from '@jest/globals';
 import { createApp } from '@/unittests/create-app';
 import { createSchema } from '@/unittests/schema';
 import emptyActionSchema from './empty-action-schema.json';
diff --git a/frontend_src/vstutils/views/__tests__/file-responses.test.js b/frontend_src/vstutils/views/__tests__/file-responses.test.js
index ed8286f3..0967b810 100644
--- a/frontend_src/vstutils/views/__tests__/file-responses.test.js
+++ b/frontend_src/vstutils/views/__tests__/file-responses.test.js
@@ -1,7 +1,12 @@
-import { jest, describe, expect, test, beforeAll, beforeEach } from '@jest/globals';
 import { fireEvent, screen, waitFor } from '@testing-library/dom';
-import fetchMock from 'jest-fetch-mock';
-import { createApp, createSchema, schemaListOf, mountApp, waitForPageLoading } from '@/unittests';
+import {
+    createApp,
+    createSchema,
+    expectRequest,
+    fetchMockCallAt,
+    schemaListOf,
+    waitForPageLoading,
+} from '@/unittests';
 import { openPage } from '@/vstutils/utils';
 
 async function assertFileDownloaded(filename, url, f) {
@@ -9,7 +14,7 @@ async function assertFileDownloaded(filename, url, f) {
 
     const called = [];
 
-    jest.spyOn(HTMLAnchorElement, 'click').mockImplementation(function () {
+    vitest.spyOn(HTMLAnchorElement, 'click').mockImplementation(function () {
         called.push({ url: this.href, filename: this.download });
     });
 
@@ -91,9 +96,7 @@ describe('file response', () => {
 
     beforeAll(async () => {
         app = await createApp({ schema });
-        await mountApp();
-        fetchMock.enableMocks();
-        jest.spyOn(window, 'open').mockImplementation(() => {});
+        vitest.spyOn(window, 'open').mockImplementation(() => {});
     });
 
     beforeEach(async () => {
@@ -168,10 +171,11 @@ describe('file response', () => {
 
         // Check request data
         expect(fetchMock).toBeCalledTimes(1);
-        expect(fetchMock).toBeCalledWith('http://test.vst/api/v1/some/make_file_with_input/', {
+        expectRequest(fetchMockCallAt(0), {
+            url: 'http://localhost/api/v1/some/make_file_with_input/',
             method: 'post',
+            body: { name: 'some-file-name' },
             headers: { 'Content-Type': 'application/json' },
-            body: '{"name":"some-file-name"}',
         });
     });
 });
diff --git a/frontend_src/vstutils/views/__tests__/hidden-views.test.js b/frontend_src/vstutils/views/__tests__/hidden-views.test.js
index faa4c95b..08122f93 100644
--- a/frontend_src/vstutils/views/__tests__/hidden-views.test.js
+++ b/frontend_src/vstutils/views/__tests__/hidden-views.test.js
@@ -1,4 +1,3 @@
-import { expect, test, beforeAll } from '@jest/globals';
 import { createApp, createSchema, schemaListOf } from '@/unittests';
 import { getApp } from '@/vstutils/utils';
 
@@ -82,7 +81,7 @@ beforeAll(async () => {
     });
 });
 
-test.only('hidden views generation', () => {
+test('hidden views generation', () => {
     const { views } = getApp();
 
     expect(views.get('/hidden/').hidden).toBeTruthy();
diff --git a/frontend_src/vstutils/views/__tests__/main-action-execution.test.ts b/frontend_src/vstutils/views/__tests__/main-action-execution.test.ts
index 1042232d..8b37c65b 100644
--- a/frontend_src/vstutils/views/__tests__/main-action-execution.test.ts
+++ b/frontend_src/vstutils/views/__tests__/main-action-execution.test.ts
@@ -1,7 +1,12 @@
-import { describe, expect, test, beforeAll, beforeEach } from '@jest/globals';
 import { waitFor } from '@testing-library/dom';
-import fetchMock from 'jest-fetch-mock';
-import { createApp, createSchema, mountApp, schemaListOf, waitForPageLoading, useTestCtx } from '@/unittests';
+import {
+    createApp,
+    createSchema,
+    schemaListOf,
+    waitForPageLoading,
+    useTestCtx,
+    expectNthRequest,
+} from '@/unittests';
 
 describe('main action execution', () => {
     beforeAll(async () => {
@@ -88,8 +93,6 @@ describe('main action execution', () => {
             },
         });
         await createApp({ schema });
-        await mountApp();
-        fetchMock.enableMocks();
     });
 
     beforeEach(() => {
@@ -111,14 +114,16 @@ describe('main action execution', () => {
 
         await waitFor(() => expect(fetchMock).toBeCalledTimes(2));
         // Create new
-        expect(fetchMock).nthCalledWith(1, 'http://localhost/api/endpoint/', {
-            body: JSON.stringify([{ method: 'post', path: ['some'], data: { name: 'some name' } }]),
+        expectNthRequest(0, {
+            url: 'http://localhost/api/endpoint/',
+            body: [{ method: 'post', path: ['some'], data: { name: 'some name' } }],
             headers: { 'Content-Type': 'application/json' },
             method: 'put',
         });
         // Redirect to list
-        expect(fetchMock).nthCalledWith(2, 'http://localhost/api/endpoint/', {
-            body: JSON.stringify([{ method: 'get', path: ['some'], query: 'limit=20&offset=0' }]),
+        expectNthRequest(1, {
+            url: 'http://localhost/api/endpoint/',
+            body: [{ method: 'get', path: ['some'], query: 'limit=20&offset=0' }],
             headers: { 'Content-Type': 'application/json' },
             method: 'put',
         });
@@ -139,14 +144,16 @@ describe('main action execution', () => {
 
         await waitFor(() => expect(fetchMock).toBeCalledTimes(2));
         // Execute action
-        expect(fetchMock).nthCalledWith(1, 'http://localhost/api/endpoint/', {
-            body: JSON.stringify([{ method: 'post', path: '/some/action/', data: { name: 'some value' } }]),
+        expectNthRequest(0, {
+            url: 'http://localhost/api/endpoint/',
+            body: [{ method: 'post', path: '/some/action/', data: { name: 'some value' } }],
             headers: { 'Content-Type': 'application/json' },
             method: 'put',
         });
         // Redirect to list
-        expect(fetchMock).nthCalledWith(2, 'http://localhost/api/endpoint/', {
-            body: JSON.stringify([{ method: 'get', path: ['some'], query: 'limit=20&offset=0' }]),
+        expectNthRequest(1, {
+            url: 'http://localhost/api/endpoint/',
+            body: [{ method: 'get', path: ['some'], query: 'limit=20&offset=0' }],
             headers: { 'Content-Type': 'application/json' },
             method: 'put',
         });
@@ -166,10 +173,9 @@ describe('main action execution', () => {
 
         await waitFor(() => expect(fetchMock).toBeCalledTimes(2));
         // Update
-        expect(fetchMock).toHaveBeenCalledWith('http://localhost/api/endpoint/', {
-            body: JSON.stringify([
-                { method: 'patch', path: ['some', 5], data: { name: 'test namenew value' } },
-            ]),
+        expectNthRequest(1, {
+            url: 'http://localhost/api/endpoint/',
+            body: [{ method: 'patch', path: ['some', 5], data: { name: 'test namenew value' } }],
             headers: { 'Content-Type': 'application/json' },
             method: 'put',
         });
diff --git a/package.json b/package.json
index 070cc80f..f15ba208 100644
--- a/package.json
+++ b/package.json
@@ -1,66 +1,44 @@
 {
   "name": "@vstconsulting/vstutils",
-  "version": "0.1.0",
+  "version": "5.10.0b1",
+  "type": "module",
   "author": "VST Consulting",
   "license": "Apache-2.0",
   "homepage": "https://gitlab.com/vstconsulting/vstutils",
   "bugs": {
     "url": "https://gitlab.com/vstconsulting/vstutils/-/issues"
   },
-  "repository": "gitlab:vstconsulting/vstutils",
-  "browserslist": [
-    "> 0.25% and not dead"
-  ],
+  "repository": {
+    "url": "git+https://gitlab.com/vstconsulting/vstutils.git"
+  },
   "engines": {
     "node": ">=18.0.0"
   },
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    },
+    "./auth-app": {
+      "import": "./dist/auth-app.js",
+      "types": "./dist/auth-app.d.ts"
+    },
+    "./style.css": {
+      "import": "./dist/style.css"
+    }
+  },
   "scripts": {
-    "build": "APP_ENV=prod webpack --json vstutils/static/bundle/output.json",
-    "devBuild": "webpack --json vstutils/static/bundle/output.json",
+    "build": "vite build -c frontend_src/spa/vite.config.ts",
+    "devBuild": "vite build -c frontend_src/spa/vite.config.ts --mode development",
+    "build-lib": "vite build -c frontend_src/vite.config.ts",
     "lint:code": "eslint --ext .js,.vue,.ts frontend_src/",
     "lint:types": "vue-tsc --noEmit -p ./frontend_src/tsconfig.json",
     "lint": "conc --group --timings npm:lint:*",
-    "test": "jest --config frontend_src/jest.config.js"
+    "test": "vitest -c frontend_src/vite.config.ts run"
   },
-  "dependencies": {
-    "@babel/runtime-corejs3": "^7.16.8",
-    "@fortawesome/fontawesome-free": "^5.12.1",
-    "@splidejs/vue-splide": "^0.3.5",
-    "@toast-ui/vue-editor": "^3.2.3",
-    "@vstconsulting/tabsignal": "^2.0.0",
-    "@vueuse/core": "^10.4.1",
-    "JavaScript-autoComplete": "https://github.com/Pixabay/JavaScript-autoComplete#1.0.4",
-    "admin-lte": "3.2.0-rc",
-    "ansi_up": "^5.0.0",
-    "bootstrap": "4.6.0",
-    "centrifuge": "^2.8.0",
-    "compressorjs": "^1.2.1",
-    "core-js": "^3.30.0",
-    "cropperjs": "^1.5.13",
-    "html5-qrcode": "^2.3.8",
-    "imask": "^6.6.3",
-    "izitoast": "1.4.0",
-    "jquery": "3.7.1",
-    "jquery-slimscroll": "1.3.8",
-    "jquery-touchswipe": "^1.6.19",
-    "jquery.scrollto": "2.1.3",
-    "jsbarcode": "^3.11.5",
-    "liquor-tree": "^0.2.70",
-    "md5": "^2.2.1",
-    "moment": "^2.24.0",
-    "moment-timezone": "^0.5.28",
-    "papaparse": "^5.4.1",
-    "pinia": "^2.1.6",
-    "portal-vue": "^2.1.7",
-    "qrcode": "^1.4.4",
-    "select2": "4.1.0-rc.0",
-    "select2-bootstrap-5-theme": "^1.3.0",
-    "visibilityjs": "^2.0.2",
-    "vue": "^2.7.15",
-    "vue-i18n": "^8.15.4",
-    "vue-router": "^3.6.5",
-    "vue-template-compiler": "^2.7.15",
-    "vue-virtual-table": "^0.2.22"
+  "dependencies": {},
+  "peerDependencies": {
+    "vue": "^2.7.16"
   },
   "resolutions": {
     "izimodal/jquery": "3.7.1",
@@ -72,47 +50,69 @@
     "admin-lte/sweetalert2": "10.16.9"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.7",
-    "@babel/eslint-parser": "^7.16.5",
-    "@babel/plugin-transform-runtime": "^7.16.8",
-    "@babel/preset-env": "^7.16.8",
-    "@testing-library/dom": "^9.0.1",
-    "@testing-library/user-event": "^14.4.3",
+    "@fortawesome/fontawesome-free": "^5.15.4",
+    "@rushstack/eslint-patch": "^1.10.2",
+    "@testing-library/dom": "^9.3.4",
+    "@testing-library/user-event": "^14.5.2",
+    "@toast-ui/vue-editor": "^3.2.3",
     "@types/bootstrap": "4.6.0",
-    "@types/jest": "^29.0.3",
     "@types/jquery": "^3.5.14",
     "@types/papaparse": "^5.3.5",
-    "@types/qrcode": "^1.5.2",
+    "@types/qrcode": "^1.5.5",
     "@types/swagger-schema-official": "^2.0.22",
-    "@typescript-eslint/eslint-plugin": "^5.37.0",
-    "@typescript-eslint/parser": "^5.37.0",
+    "@vitejs/plugin-vue2": "^2.3.1",
+    "@vitest/coverage-istanbul": "^1.5.1",
+    "@vstconsulting/tabsignal": "^2.0.0",
+    "@vue/eslint-config-typescript": "^13.0.0",
     "@vue/test-utils": "^1.3.0",
-    "@vue/vue2-jest": "^29.0.0",
-    "babel-jest": "^29.0.0",
-    "babel-loader": "^8.2.3",
+    "@vueuse/core": "^10.9.0",
+    "admin-lte": "3.2.0-rc",
+    "ansi_up": "^5.0.0",
+    "bootstrap": "4.6.0",
+    "centrifuge": "^2.8.0",
+    "compressorjs": "^1.2.1",
     "concurrently": "^8.2.1",
-    "css-loader": "^6.5.1",
-    "dotenv": "^11.0.0",
+    "cropperjs": "^1.6.1",
     "eslint": "^8.6.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-security": "^1.7.1",
-    "eslint-plugin-vue": "^9.5.0",
-    "jest": "^29.0.0",
-    "jest-canvas-mock": "^2.5.2",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-fetch-mock": "^3.0.3",
+    "eslint-plugin-vitest-globals": "^1.5.0",
+    "eslint-plugin-vue": "^9.25.0",
+    "html5-qrcode": "^2.3.8",
+    "imask": "^7.6.0",
+    "izitoast": "1.4.0",
+    "jquery": "3.7.1",
+    "jquery-slimscroll": "1.3.8",
+    "jquery-touchswipe": "^1.6.19",
+    "jquery.scrollto": "2.1.3",
+    "jsbarcode": "^3.11.5",
+    "jsdom": "^24.0.0",
+    "liquor-tree": "^0.2.70",
+    "md5": "^2.2.1",
+    "moment": "^2.30.1",
+    "moment-timezone": "^0.5.45",
+    "oidc-client-ts": "^3.0.1",
+    "papaparse": "^5.4.1",
+    "pinia": "^2.1.7",
+    "portal-vue": "^2.1.7",
     "prettier": "^2.8.1",
+    "qrcode": "^1.5.3",
     "sass": "^1.47.0",
-    "sass-loader": "^12.4.0",
-    "style-loader": "^3.3.3",
-    "ts-jest": "^29.1.1",
-    "ts-loader": "^9.4.4",
+    "select2": "4.1.0-rc.0",
+    "select2-bootstrap-5-theme": "^1.3.0",
+    "swiper": "^11.1.1",
     "typescript": "^5.2.2",
-    "vue-loader": "^15.10.2",
-    "vue-tsc": "^1.8.15",
-    "webpack": "^5.89.0",
-    "webpack-bundle-analyzer": "^4.9.1",
-    "webpack-cli": "^4.10.0"
+    "visibilityjs": "^2.0.2",
+    "vite": "^5.2.9",
+    "vite-plugin-dts": "^3.8.3",
+    "vite-tsconfig-paths": "^4.3.2",
+    "vitest": "^1.5.0",
+    "vitest-fetch-mock": "^0.2.2",
+    "vue": "^2.7.16",
+    "vue-i18n": "^8.28.2",
+    "vue-router": "^3.6.5",
+    "vue-template-compiler": "^2.7.16",
+    "vue-virtual-table": "^0.2.22"
   }
 }
diff --git a/pyproject.toml b/pyproject.toml
index 79035ab8..83a7700a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=61.2", "vstcompile~=2.0"]
+requires = ["setuptools>=61.2", "vstcompile~=3.0"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -156,5 +156,6 @@ module = [
     "kombu.*",
     "tarantool.*",
     "pywebpush.*",
+    "authlib.*",
 ]
 ignore_missing_imports = true
diff --git a/requirements-prod.txt b/requirements-prod.txt
index 1eef07ae..884b79bb 100644
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -3,5 +3,5 @@
 # mysql-connector-python==8.0.15; python_version>'3.4'
 # Advanced cache support
 redis[hiredis]~=5.0.3
-tarantool~=1.1.2
+tarantool~=1.2.0
 pywebpush~=2.0.0
diff --git a/requirements.txt b/requirements.txt
index 31622f95..dbaad3e3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,10 @@
 # Main packages
 configparserc~=2.0.2
-Markdown~=3.5.2
+Markdown~=3.6
 django-environ~=0.11.2
 
 # REST API packages
-djangorestframework~=3.15.0
+djangorestframework~=3.15.1
 drf-yasg==1.21.7
 django-filter==23.5
 drf_orjson_renderer==1.7.1
@@ -21,7 +21,9 @@ aiofiles==23.2.1
 
 # Notifications
 cent~=4.1.0
-PyJWT~=2.8.0
+
+# Auth
+Authlib==1.3.0
 
 # Minificators
 jsmin~=3.0.1
diff --git a/test_src/test_proj/__init__.py b/test_src/test_proj/__init__.py
index 991ee36a..c1d460fd 100644
--- a/test_src/test_proj/__init__.py
+++ b/test_src/test_proj/__init__.py
@@ -18,9 +18,7 @@
     "DJANGO_SETTINGS_MODULE": 'test_proj.settings',
     "TEST_PROJ_UWSGI_HARAKIRI": "120",
     "TEST_PROJ_UWSGI_VACUUM": "true",
+    "VST_DEV_SETTINGS": os.path.join(os.path.dirname(__file__), 'test_settings.ini'),
 }
 
-if 'test' in sys.argv:
-    settings["VST_DEV_SETTINGS"] = os.path.join(os.path.dirname(__file__), 'test_settings.ini')
-
 prepare_environment(**settings)
diff --git a/test_src/test_proj/extra_claims_provider.py b/test_src/test_proj/extra_claims_provider.py
new file mode 100644
index 00000000..25e688e1
--- /dev/null
+++ b/test_src/test_proj/extra_claims_provider.py
@@ -0,0 +1,2 @@
+def extra_claims_provider(user):
+    return {'sup': user.is_superuser}
diff --git a/test_src/test_proj/settings.py b/test_src/test_proj/settings.py
index 80eca5b6..d2c2c530 100644
--- a/test_src/test_proj/settings.py
+++ b/test_src/test_proj/settings.py
@@ -110,6 +110,9 @@
 API[VST_API_VERSION][r'dynamic_fields'] = dict(
     model='test_proj.models.dynamic_fields.DynamicFields'
 )
+API[VST_API_VERSION][r'oauth2_tests'] = dict(
+    view='test_proj.views.TestOauth2ViewSet',
+)
 API['v2']['testbinaryfiles2'] = dict(
     view='test_proj.views.TestBinaryFilesViewSet'
 )
@@ -168,6 +171,15 @@
 DOCKER_DATABASES_TO_MIGRATE = ('primary1',)
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 
-REST_FRAMEWORK['DEFAULT_AUTHENTICATION_CLASSES'] += ('rest_framework.authentication.BasicAuthentication',)
+REST_FRAMEWORK['DEFAULT_AUTHENTICATION_CLASSES'] += (
+    'rest_framework.authentication.BasicAuthentication',
+)
 
 WEBPUSH_USER_SETTINGS_VIEW_SUBPATH = 'custom_path'
+
+OAUTH_SERVER_CLIENTS['some-app'] = {
+    'allowed_grant_types': ['authorization_code'],
+    'token_endpoint_auth_methods': ['none'],
+    'allowed_redirect_uris': 'https://some-app.com/auth-callback',
+    'allowed_response_types': ['code'],
+}
diff --git a/test_src/test_proj/test_settings.ini b/test_src/test_proj/test_settings.ini
index 80b667bd..d51f6cdf 100644
--- a/test_src/test_proj/test_settings.ini
+++ b/test_src/test_proj/test_settings.ini
@@ -5,6 +5,9 @@ enable_registration = true
 log_level = debug
 debug = true
 enable_custom_translations = true
+enable_admin_panel = true
+enable_agreement_terms = true
+enable_consent_to_processing = true
 
 [web]
 cors_allow_all_origins = true
@@ -43,7 +46,7 @@ timeout = 10
 [database]
 
 [cache]
-backend = django_redis.cache.RedisCache
+backend = django.core.cache.backends.redis.RedisCache
 location = redis://127.0.0.1:/0
 
 [cache.options]
@@ -61,13 +64,14 @@ location = redis://127.0.0.1:/1
 
 [locks]
 backend = django.core.cache.backends.filebased.FileBasedCache
+location = /tmp/test_proj/locks
 
 [locks.options]
 max_entries = 1000
 
 [etag]
-backend = django.core.cache.backends.memcached.PyLibMCCache
-location = 127.0.0.1:11211,127.0.0.2:11211
+backend = django.core.cache.backends.redis.RedisCache
+location = redis://127.0.0.1:6379,redis://127.0.0.1:6378
 
 [locks.options]
 max_entries = 1000
@@ -112,3 +116,11 @@ vapid_private_key = kVUgUbSz5254_wYdevQwzoOykKyJXIybjVig4dNf2Pc
 vapid_public_key = BE_xy2ppCYxi4yhsoKebw-cArqZlmLg3WHZS8cz4jyi0fK8wFf-KM0ODx9joEcLihCIdg_7FZ_lYQOd2PWWvhi8
 vapid_admin_email = webpush@test_proj
 default_notification_icon = /static/img/logo.png
+
+[oauth]
+server_issuer = https://test_proj.vst
+server_authorization_endpoint = https://some-server/auth
+server_allow_insecure = true
+server_enable_anon_login = true
+server_jwt_extra_claims_provider = test_proj.extra_claims_provider.extra_claims_provider
+server_jwt_key = 080f_mMTp4cEwq4z-ofXtyR5UNantGn2PPWjVRJlps7yIhJMucqEsJRW2h5O0lrCUjiXoLOmQ06OX17yVvWefVnYJsHBSGpq1poQGyyCHWH66lU61iglKxFuTWYyOd6oQJ8ylgDFMwzFBtMvo1ZtsNBVal5zn1x8f-gECQ-BlpYiU-OrVsbRlk2dIaIG41Hp_bL9XYEBxSjukoUyw19jfqRb2-hg4B7NBnyxAKwqpKDKXCqAR2ic3im5-8vnPXn7Q-XQuzU5dygaBropqc4vn-GIyEjjr3mne-DHFUtlvP8p-A2Mzr9qUyMDoAS_p377CvaQvoSo124V3TiXwh-5bA
diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index dff6a431..fbc09a8d 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -15,8 +15,9 @@
 from copy import deepcopy
 from pathlib import Path
 from smtplib import SMTPException
+from urllib.parse import urlencode, parse_qs, urlparse
 
-from unittest.mock import patch, PropertyMock
+from unittest.mock import patch, PropertyMock, Mock
 
 from collections import OrderedDict
 
@@ -31,7 +32,10 @@
 from django.db.models import F
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.management import call_command
+from django.core.management.base import SystemCheckError
 from django.template.exceptions import TemplateDoesNotExist
+
+from vstutils.api.schema.generators import get_oauth2_security_definition
 try:
     from django.middleware.csrf import _get_new_csrf_token
 except ImportError:  # nocv
@@ -40,16 +44,17 @@
 from django.utils.http import http_date
 from django.contrib.auth.hashers import make_password
 from django.contrib.auth import get_user_model
-from django.test import Client
 from django.http import FileResponse, HttpResponseNotModified
 from django.test.client import RequestFactory
 from django.urls import reverse
 from fakeldap import MockLDAP
 import requests
 from pywebpush import WebPushException
+from authlib.jose import jwt
+from authlib.oauth2.rfc6749 import OAuth2Request
 
 from vstutils import utils
-from vstutils.api.models import Language
+from vstutils.api.models import Language, TwoFactor
 from vstutils.api.schema.inspectors import X_OPTIONS
 from vstutils.api.serializers import BaseSerializer
 from vstutils.api.validators import (
@@ -77,6 +82,9 @@
 from vstutils.webpush.models import WebPushDeviceSubscription, WebPushNotificationSubscription
 from vstutils.webpush.utils import subscribe_device, update_user_subscriptions
 from vstutils.webpush.test_utils import subscribe_user_device_to_pushes
+from vstutils.oauth2.jwk import jwk_set as oauth2_server_jwk_set
+from vstutils.oauth2.endpoints import server as authorization_server
+from vstutils.oauth2.user import UserWrapper
 
 from .models import (
     File,
@@ -160,6 +168,8 @@
     'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
 }
 
+User = get_user_model()
+
 
 def to_soup(content):
     return BeautifulSoup(content, 'html.parser')
@@ -314,15 +324,8 @@ def raised_func(*args, **kwargs):
 class VSTUtilsTestCase(BaseTestCase):
     use_msgpack = True
 
-    def _get_test_ldap(self, client, data):
-        self.client.post(self.login_url, data=data, HTTP_X_AUTH_PLUGIN='DJANGO')
-        response = client.get('/api/v1/user/')
-        self.assertNotEqual(response.status_code, 200)
-        response = self.client.post(self.logout_url)
-        self.assertEqual(response.status_code, 302)
-
     @patch('ldap.initialize')
-    def test_ldap_auth(self, ldap_obj):
+    def test_ldap(self, ldap_obj):
         User = self.get_model_class('django.contrib.auth.models.User')
         User.objects.create(username='admin', password='some_strong_password')
         # Test on fakeldap
@@ -334,15 +337,6 @@ def test_ldap_auth(self, ldap_obj):
             "cn=admin,dc=test,dc=lan": admin_dict,
             'test': {"userPassword": admin_password}
         })
-        data = dict(username=admin, password=admin_password)
-        client = Client()
-        ldap_obj.return_value = LDAP_obj
-        self._get_test_ldap(client, data)
-        data['username'] = 'test'
-        with override_settings(LDAP_DOMAIN='test.lan'):
-            self._get_test_ldap(client, data)
-        with override_settings(LDAP_DOMAIN='TEST'):
-            self._get_test_ldap(client, data)
 
         # Unittest
         ldap_backend = LDAP(
@@ -741,9 +735,6 @@ class ViewsTestCase(BaseTestCase):
     def test_main_views(self):
         # Main
         self.get_result('get', '/')
-        self.get_result('post', self.logout_url, 302)
-        self.get_result('post', self.login_url, 302)
-        self.get_result('get', self.login_url, 302)
         # API
         api = self.get_result('get', '/api/')
         print(api)
@@ -761,7 +752,6 @@ def test_main_views(self):
         )
 
         # Check static views
-        self.get_result('get', '/static/bundle/output.json', code=200)
         self.get_result('get', '/docs/', code=200)
         self.get_result('get', '/docs/index.html', code=200)
 
@@ -770,10 +760,8 @@ def test_main_views(self):
         response = fclient.get('/docs/')
         self.assertEqual(response.status_code, 200)
 
-        response = fclient.get('/static/bundle/')
+        response = fclient.get('/static/404/')
         self.assertEqual(response.status_code, 404, response.content)
-        response = fclient.get('/static/bundle/output.json')
-        self.assertEqual(response.status_code, 200)
         response = fclient.get('/media/test.txt')
         self.assertEqual(response.status_code, 200)
 
@@ -802,6 +790,20 @@ def test_main_views(self):
             response = self.get_result('get', f'/{js_url}')
             self.assertCount(str(response).split('\n'), 1, f'{js_url} is longer than 1 string.')
 
+    def test_spa_routes(self):
+        client = self.api_test_client
+
+        response = client.get('/')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.headers['content-type'], 'text/html; charset=utf-8')
+        self.assertIn('<div id="app"></div>', response.text)
+        script = re.compile(r'src="(/spa/.+\.js)"></script>').search(response.text).group(1)
+
+        response = client.get(script)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.headers['content-type'], 'text/javascript; charset=utf-8')
+        self.assertEqual(response.headers['cache-control'], 'public, max-age 2592000')
+
     def test_uregister(self):
         router_v1 = router.routers[0][1]
         router_v1.unregister("user")
@@ -913,10 +915,7 @@ def test_users_api(self):
             password2='12345'
         )
         user_get_request = {"method": "get", "path": ['user', 'profile']}
-        self.client.post(
-            f'{self.login_url}?lang=ru',
-            data=self.user.data
-        )
+        self.client.force_login(self.user)
         results = self.bulk([
             {"method": "post", "path": ['user', 'profile', 'change_password'], "data": i}
             for i in (invalid_old_password, not_identical_passwords, update_password)
@@ -1008,197 +1007,13 @@ def test_user_gravatar(self):
         gravatar_of_nonexistent_user = get_user_gravatar(123321)
         self.assertEqual(default_gravatar, gravatar_of_nonexistent_user)
 
-    def test_reset_password(self):
-        test_user = self._create_user(is_super_user=False)
-        client = self.client_class()
-        response = client.post(self.login_url, {'username': test_user.username, 'password': test_user.password})
-        self.assertEqual(response.status_code, 200)
-        response = client.post(self.logout_url)
-        self.assertEqual(response.status_code, 302)
-        response = client.post(reverse('password_reset'), {'email': 'error@error.error'})
-        self.assertEqual(response.status_code, 302)
-        self.assertCount(mail.outbox, 0)
-        response = client.post(reverse('password_reset'), {'email': test_user.email})
-        self.assertEqual(response.status_code, 302)
-        regex = r"^http(s)?:\/\/.*$"
-        match = re.search(regex, mail.outbox[-1].body, re.MULTILINE)
-        href = match.group(0)
-        response = client.post(href, {'new_password1': 'newpass', 'new_password2': 'newpass'})
-        self.assertEqual(response.status_code, 302)
-        response = client.post(self.login_url, {'username': test_user.username, 'password': 'newpass'})
-        self.assertEqual(response.status_code, 200)
-
-    def test_register_new_user(self):
-        # create user data and init client class
-        user = dict(
-            username='newuser',
-            password1='pass',
-            password2='pass',
-            email='new@user.com',
-            agreement=True,
-            consent_to_processing=True,
-        )
-        user_fail = dict(
-            username='newuser',
-            password1='pass',
-            password2='pss',
-            email='new@user.com',
-            agreement=True,
-            consent_to_processing=True,
-        )
-        client = self.client_class()
-
-        self.assertIsNone(get_user_model().objects.filter(email=user['email']).last())
-
-        # Try register failed user data
-        response = self.call_registration(user_fail)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(
-            ''.join(response.context_data['form'].errors.get('password2', [])),
-            'The two password fields didn\'t match.'
-        )
-
-        # Try register user without data
-        response = self.call_registration(None)
-        self.assertEqual(response.status_code, 200)
-        self.assertListEqual(
-            list(response.context_data['form'].errors.keys()),
-            ['username', 'email', 'password1', 'password2', 'agreement', 'consent_to_processing']
-        )
-
-        # Correct registration request
-        response = self.call_registration(user)
-        self.assertRedirects(response, self.confirmation_redirect_url)
-
-        self.assertCount(mail.outbox, 1)
-        regex = r"http(s)?:\/\/.*\/registration\/(\?.*?(?=\")){0,1}"
-        match = re.search(regex, mail.outbox[-1].alternatives[-1][0], re.MULTILINE)
-        href = match.group(0)
-
-        href_base, correct_uid = href.split('uid=')
-
-        response = client.post(href_base, {'uid': 'wrong'})
-        self.assertEqual(response.status_code, 200)
-        self.assertDictEqual(response.context_data['form'].errors.get_json_data(), {
-            'uid': [{'message': 'Confirmation link is invalid or expired', 'code': ''}],
-        })
-
-        # Check email and uid in create method
-        secure_pickle = SecurePickling(settings.SECRET_KEY)
-        fail_check_email_user = user.copy()
-        fail_check_email_user['email'] = 'new_random_changed@email.com'
-        cache_key_unhashed = 'not_correct@email.com'
-        cache_key_hashed = make_password(cache_key_unhashed)
-
-        cache.set(cache_key_hashed, secure_pickle.dumps(fail_check_email_user))
-        fail_check_email_user['uid'] = cache_key_hashed
-        response = client.post(href_base, fail_check_email_user)
-        self.assertEqual(response.status_code, 400)
-
-        # Success registration
-        user['uid'] = correct_uid
-        response = client.post(href, user)
-        self.assertRedirects(response, self.login_url, target_status_code=302)
-
-        client.post(href_base, {'uid': correct_uid})
-        response = client.post(href_base, {'uid': correct_uid})
-        self.assertEqual(len(response.context['form'].errors), 1)
-        self.assertEqual(response.context['form'].errors['uid'][0], 'Confirmation link is invalid or expired')
-
-        get_user_model().objects.filter(email=user['email']).delete()
-        response = client.post(href, {'uid': user['uid']})
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.context['form'].errors), 1)
-        self.assertEqual(response.context['form'].errors['uid'][0], 'Confirmation link is invalid or expired')
-
-        client.post(self.logout_url)
-        client.get(href)
-        response = client.post(href, user)
-        self.assertEqual(response.status_code, 302)
-
-    def test_registration_with_confirmation(self):
-        user = dict(
-            first_name='alex',
-            last_name='mercer',
-            password1='New@password22',
-            password2='New@password22',
-            email='new@user.com',
-            username='trop',
-            agreement=True,
-            consent_to_processing=True
-        )
-
-        client = self.client_class()
-        response = self.call_registration(data=user, HTTP_ACCEPT_LANGUAGE='ru-RU')
-        self.assertRedirects(response, self.confirmation_redirect_url)
-        response = client.get(self.confirmation_redirect_url)
-        self.assertIn('Confirm your email before logging in', str(response.content))
-
-        self.assertCount(mail.outbox, 1)
-        confirmation_message = str(mail.outbox[-1].message())
-
-        self.assertIn('Подтвердите свой аккаунт', confirmation_message)
-        self.assertIn('Пожалуйста, подтвердите свой Example Project аккаунт', confirmation_message)
-
-        regex = r"http(s)?:\/\/.*\/registration\/(\?.*?(?=\")){0,1}"
-        match = re.search(regex, confirmation_message, re.MULTILINE)
-        href = match.group(0)
-        correct_uid = href.split('uid=')[-1]
-        response = client.post(self.login_url, data={'username': user['username'], 'password': user['password1']})
-        # login failed
-        self.assertIn('Please enter a correct username and password', str(response.context_data['form'].errors))
-        response = client.get('/')
-        self.assertFalse(response.wsgi_request.user.is_authenticated)
-        # confirm email (different client)
-        client2 = self.client_class()
-        response = client2.post(href, {'uid': correct_uid})
-        self.assertRedirects(response, self.login_url, target_status_code=302)
-        response = client2.post(self.login_url, data={'username': user['username'], 'password': user['password1']})
-        # successful login
-        response = client2.get('/')
-        self.assertTrue(response.wsgi_request.user.is_authenticated)
-
     def test_terms_agreement(self):
-        user = dict(
-            username='newuser',
-            password1='pass',
-            password2='pass',
-            email='new@user.com',
-            agreement=True,
-            consent_to_processing=True,
-        )
-        user_fail = dict(
-            username='newuser',
-            password1='pass',
-            password2='pass',
-            email='new@user.com',
-            consent_to_processing=True,
-        )
-        client = self.client_class()
-
         lang_text_data = {
             'ru': 'лицензионное соглашение',
             'en': 'terms of agreement',
             'cn': '协议条款',
             'vi': 'các điều khoản của thỏa thuận'
         }
-        # Correct registration request returns redirect
-        response = self.call_registration(user)
-        self.assertRedirects(response, self.confirmation_redirect_url)
-
-        # Try registration without agreement returns error
-        response = self.call_registration(user_fail)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(
-            response.context_data['form'].errors['agreement'][0],
-            'To continue, need to accept the terms agreement.'
-        )
-
-        # If ENABLE_AGREEMENT_TERMS=False, registration without agreement returns redirect
-        with override_settings(ENABLE_AGREEMENT_TERMS=False):
-            response = self.call_registration(user_fail)
-            self.assertRedirects(response, self.confirmation_redirect_url)
-
         # Response with 'lang=en' returns default 'terms.md' with correct html
         with utils.tmp_file(data='## test_header', encoding='utf8') as md_file:
             with override_settings(AGREEMENT_TERMS_PATH=md_file.path):
@@ -1218,46 +1033,12 @@ def test_terms_agreement(self):
                     self.assertContains(response_with_en_lang, f'<h2>{item[1]}</h2>')
 
     def test_personal_data_processing(self):
-        user = dict(
-            username='newuser',
-            password1='pass',
-            password2='pass',
-            email='new@user.com',
-            agreement=True,
-            consent_to_processing=True,
-        )
-        user_fail = dict(
-            username='newuser',
-            password1='pass',
-            password2='pass',
-            email='new@user.com',
-            agreement=True,
-        )
-        client = self.client_class()
-
         lang_text_data = {
             'ru': 'политика обработки персональных данных',
             'en': 'personal data processing policy',
             'cn': '个人资料处理政策',
             'vi': 'chính sách xử lý dữ liệu cá nhân'
         }
-        # Correct registration request returns redirect
-        response = self.call_registration(user)
-        self.assertRedirects(response, self.confirmation_redirect_url)
-
-        # Try registration without consent_to_processing returns error
-        response = self.call_registration(user_fail)
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(
-            response.context_data['form'].errors['consent_to_processing'][0],
-            'To continue, need to agree to the personal data processing policy.'
-        )
-
-        # If ENABLE_CONSENT_TO_PROCESSING=False, registration without `consent_to_processing` returns redirect
-        with override_settings(ENABLE_CONSENT_TO_PROCESSING=False):
-            response = self.call_registration(user_fail)
-            self.assertRedirects(response, self.confirmation_redirect_url)
-
         # Response with 'lang=en' returns default 'consent_to_processing.md' with correct html
         with utils.tmp_file(data='## test_header', encoding='utf8') as md_file:
             with override_settings(CONSENT_TO_PROCESSING_PATH=md_file.path):
@@ -1280,47 +1061,6 @@ def test_personal_data_processing(self):
         response_without_file = self.client.get(reverse('consent_to_processing'))
         self.assertEqual(response_without_file.status_code, 404)
 
-    @override_settings(SEND_CONFIRMATION_EMAIL=False, AUTHENTICATE_AFTER_REGISTRATION=False)
-    def test_register_new_user_without_confirmation(self):
-        user = dict(
-            username='newuser',
-            password1='pass',
-            password2='pass',
-            email='new@user.com',
-            agreement=True,
-            consent_to_processing = True,
-        )
-        user_fail = dict(
-            username='newuser',
-            password1='pass',
-            password2='pss',
-            email='new@user.com',
-            agreement=True,
-            consent_to_processing=True,
-        )
-        client = self.client_class()
-        response = client.post(self.login_url, {'username': user['username'], 'password': user['password1']})
-        self.assertEqual(response.status_code, 200)
-        response = self.call_registration(user_fail)
-        self.assertEqual(response.status_code, 200)
-        response = self.call_registration(user)
-        self.assertRedirects(response, self.login_url)
-        response = client.post(self.login_url, {'username': user['username'], 'password': user['password2']})
-        self.assertRedirects(response, '/')
-
-    def test_login_redirects(self):
-        user = self._create_user(is_super_user=False)
-        client = self.client_class()
-        redirect_page = '/#/user/1/notification_settings'
-
-        # Test that login POST handler redirects after successful login
-        response = client.post(self.login_url, {
-            'username': user.data['username'],
-            'password': user.data['password'],
-            'next': redirect_page
-        })
-        self.assertRedirects(response, redirect_page)
-
     @override_settings(MAX_TFA_ATTEMPTS=4)
     def test_2fa(self):
         secret = 'base32secret3232'
@@ -1389,48 +1129,6 @@ def test_2fa(self):
         self.assertEqual(results[9]['data'], {'enabled': True})
         self.assertEqual(self.user.twofa.recoverycode.all().count(), 2)
 
-        # Check logout after invalid attempts
-        client = self.client_class()
-        client.post(self.login_url, data=self.user.data)
-        with self.patch('pyotp.TOTP.verify') as mock_obj:
-            mock_obj.side_effect = lambda x: x == pin
-            # Make 3 attempts with invalid pin
-            client.post(self.login_url, data={'pin': '111'})
-            client.post(self.login_url, data={'pin': '111'})
-            response = client.post(self.login_url, data={'pin': '111'})
-            # Check that response contains error message
-            self.assertContains(response, 'Invalid authentication code')
-            # Make 4th attempt
-            response = client.post(self.login_url, data={'pin': '111'})
-            # Check that login page returned
-            self.assertContains(response, 'Sign in to start your session')
-
-        # Check recovery codes
-        client = self.client_class()
-        client.post(self.login_url, data=self.user.data)
-        response = client.post(self.login_url, data={'pin': 'cod-e2'})
-        self.assertEqual(response.status_code, 302)
-        self.assertEqual(self.user.twofa.recoverycode.all().count(), 1)
-        response = client.get('/')
-        self.assertEqual(response.status_code, 200)
-
-        # Check login and redirects
-        client = self.client_class()
-        client.post(self.login_url, data=self.user.data)
-        self.assertTrue(settings.SESSION_COOKIE_NAME in client.cookies)
-
-        response = client.get('/')
-        self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.url, self.login_url)
-
-        with self.patch('pyotp.TOTP.verify') as mock_obj:
-            mock_obj.side_effect = lambda x: x == pin
-            response = client.post(self.login_url, data={'pin': pin})
-            self.assertEqual(response.status_code, 302)
-
-        response = client.get('/')
-        self.assertEqual(response.status_code, 200)
-
     def test_user_settings(self):
         initial_settings = {'custom': {}, 'main': {'dark_mode': False, 'language': 'en'}}
         custom_settings = {'custom': {'key1': 'val1'}, 'main': {'dark_mode': False, 'language': 'en'}}
@@ -1510,6 +1208,204 @@ def test_non_superuser_cannot_change_is_staff_status(self):
             self.assertFalse(nonstaff_user.is_staff)
 
 
+class APIAuthViewsTestCase(BaseTestCase):
+    @override_settings(SEND_CONFIRMATION_EMAIL=False)
+    def test_registration(self):
+        # Test successful registration
+        response = self.client_class().post(
+            '/api/oauth2/registration/',
+            {
+                'username': 'test_user',
+                'password': 'test_password',
+                'email': 'test@user.test',
+            },
+            content_type='application/json',
+        )
+        self.assertEqual(response.status_code, 201)
+        self.assertEqual(response.json(), {
+            'email_confirmation_required': False,
+            'email': 'test@user.test',
+            'username': 'test_user',
+            'first_name': '',
+            'last_name': '',
+        })
+        self.assertDictEqual(
+            User.objects.filter(username='test_user').values('email', 'first_name', 'last_name', 'username').first(),
+            {
+                'email': 'test@user.test',
+                'first_name': '',
+                'last_name': '',
+                'username': 'test_user',
+            },
+        )
+        self.assertTrue(User.objects.get(username='test_user').check_password('test_password'))
+
+        # Test registration with existing username
+        response = self.client_class().post(
+            '/api/oauth2/registration/',
+            {
+                'username': 'test_user',
+                'password': 'test_password',
+                'email': 'test@user.test',
+            },
+            content_type='application/json',
+        )
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json(), {'username': ['User with this username already exists.']})
+
+        # Test registration with missing data
+        response = self.client_class().post(
+            '/api/oauth2/registration/',
+            {},
+            content_type='application/json',
+        )
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json(), {
+            'password': ['This field is required.'],
+            'username': ['This field is required.'],
+        })
+
+    @override_settings(SEND_CONFIRMATION_EMAIL=True)
+    def test_registration_with_email_confirmaion(self):
+        # Test successful registration
+        response = self.client_class().post(
+            '/api/oauth2/registration/',
+            {
+                'username': 'test_user',
+                'password': 'test_password',
+                'email': 'test@user.test',
+            },
+            content_type='application/json',
+        )
+        self.assertEqual(response.status_code, 201)
+        self.assertEqual(response.json(), {
+            'email_confirmation_required': True,
+            'email': 'test@user.test',
+            'username': 'test_user',
+        })
+        self.assertFalse(User.objects.filter(username='test_user').exists())
+
+        # Check confirmation message
+        self.assertEqual(len(mail.outbox), 1)
+        msg = mail.outbox[0]
+        self.assertEqual(msg.to, ['test@user.test'])
+        content = str(msg.message())
+        match = re.search(r'href="http://testserver/#/auth/registration/confirm-email/([\w\$]+)"', content)
+        self.assertIsNotNone(match)
+
+        # Verify email
+        with self.captureOnCommitCallbacks(execute=True):
+            response = self.client_class().post(
+                '/api/oauth2/confirm_email/',
+                {'code': match.group(1)},
+                content_type='application/json',
+            )
+        self.assertEqual(response.status_code, 201)
+        self.assertEqual(response.json(), {})
+        user = User.objects.filter(username='test_user').first()
+        self.assertIsNotNone(user)
+        self.assertTrue(user.check_password('test_password'))
+
+        # Test same code second time
+        response = self.client_class().post(
+            '/api/oauth2/confirm_email/',
+            {'code': match.group(1)},
+            content_type='application/json',
+        )
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json(), {'code': ['Confirmation code is invalid or expired.']})
+
+    def test_registration_email_check(self):
+        user = {
+            'username': 'newuser',
+            'password': 'pass',
+            'email': 'new@user.com',
+        }
+        response = self.client_class().post(
+            '/api/oauth2/registration/',
+            user,
+            content_type='application/json',
+        )
+        secure_pickle = SecurePickling(settings.SECRET_KEY)
+        fail_check_email_user = user.copy()
+        fail_check_email_user['email'] = 'new_random_changed@email.com'
+        new_code = make_password('not_correct@email.com')
+        cache.set(new_code, secure_pickle.dumps(fail_check_email_user))
+        response = self.client_class().post(
+            '/api/oauth2/confirm_email/',
+            {'code': new_code},
+            content_type='application/json',
+        )
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json(), {'code': ['Invalid registration email send.']})
+
+    def test_password_reset(self):
+        # Unknown email
+        response = self.client_class().post(
+            '/api/oauth2/password_reset/',
+            {'email': 'unknown@user.com'},
+            content_type='application/json',
+        )
+        self.assertEqual(response.status_code, 201)
+        self.assertEqual(response.json(), {})
+        self.assertEqual(len(mail.outbox), 0)
+
+        # Real user
+        user = self._create_user(is_super_user=False, email='test_user@email.com')
+        response = self.client_class().post(
+            '/api/oauth2/password_reset/',
+            {'email': 'test_user@email.com'},
+            content_type='application/json',
+        )
+        self.assertEqual(response.status_code, 201)
+        self.assertEqual(response.json(), {})
+        self.assertEqual(len(mail.outbox), 1)
+        msg = mail.outbox[0]
+        content = str(msg.message())
+        match = re.search(r'http://testserver/#/auth/password-reset/([\w=]+)/([\w=-]+)', content)
+        self.assertIsNotNone(match)
+        uid = match.group(1)
+        token = match.group(2)
+
+        # Check invalid uid
+        response = self.client_class().post(
+            '/api/oauth2/password_reset_confirm/',
+            {'uid': 'invalid', 'token': token, 'password': 'new_password'},
+            content_type='application/json',
+        )
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json(), {'uid': ['Invalid value']})
+
+        # Check invalid token
+        response = self.client_class().post(
+            '/api/oauth2/password_reset_confirm/',
+            {'uid': uid, 'token': 'invalid', 'password': 'new_password'},
+            content_type='application/json',
+        )
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json(), {'token': ['Invalid value']})
+
+        # Try set invalid password
+        response = self.client_class().post(
+            '/api/oauth2/password_reset_confirm/',
+            {'uid': uid, 'token': token, 'password': 'test_user@email.com'},
+            content_type='application/json',
+        )
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json(), {'password': ['The password is too similar to the email address.']})
+
+        # Try set valid password
+        response = self.client_class().post(
+            '/api/oauth2/password_reset_confirm/',
+            {'uid': uid, 'token': token, 'password': 'new_password'},
+            content_type='application/json',
+        )
+        self.assertEqual(response.status_code, 201)
+        self.assertEqual(response.json(), {})
+        user.refresh_from_db()
+        self.assertTrue(user.check_password('new_password'))
+
+
 class DefaultBulkTestCase(BaseTestCase):
     use_msgpack = True
 
@@ -1558,7 +1454,8 @@ def test_bulk(self):
             dict(method='get', path=['usr', self.user.id])
         ]
         self.bulk_transactional(bulk_request_data, 502)
-        self.client.post(f'{self.login_url}?lang=ru', self.user.data)
+        self.client.force_login(self.user)
+        self.client.get('/?lang=ru')
         result = self.bulk(
             bulk_request_data,
             headers={'accept-language': 'ru,en-US;q=0.9,en;q=0.8,ru-RU;q=0.7,es;q=0.6'},
@@ -1686,7 +1583,6 @@ def test_cookies_on_endpoint_calls(self):
         self.assertIn('ETag', results[0]['headers'])
         self.assertEqual(results[1]['status'], 200)
         self.assertEqual(results[1]['data']['swagger'], '2.0')
-        self.assertEqual(results[1]['data']['info']['x-settings']['logout_url'], self.logout_url)
         self.client.logout()
 
     @override_settings(
@@ -2410,7 +2306,10 @@ def test_etag(self):
 
     def test_api_version_request(self):
         api = self.get_result('get', '/api/endpoint/?format=openapi&version=v2', 200)
-        paths_which_is_tech = (r'settings', r'_lang')
+        paths_which_is_tech = (
+            r'settings',
+            r'_lang',
+        )
 
         valid_paths = [
             f'/{y}/'
@@ -3379,23 +3278,23 @@ def test_user_language_detection(self):
         )
 
         for expected_code, header in languages:
-            response = self.client_class().get(self.login_url, HTTP_ACCEPT_LANGUAGE=header)
+            response = self.client_class().get('/', HTTP_ACCEPT_LANGUAGE=header)
             self.assertEqual(response.status_code, 200)
             self.assertEqual(response.cookies['lang'].value, expected_code)
             self.assertEqual(to_soup(response.content).html['lang'], expected_code, f'Header: {header}')
 
-        response = client.get(f'{self.login_url}?lang=ru', HTTP_ACCEPT_LANGUAGE='de,es;q=0.9')
+        response = client.get('/?lang=ru', HTTP_ACCEPT_LANGUAGE='de,es;q=0.9')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.cookies.get('lang').value, 'ru')
         self.assertEqual(to_soup(response.content).html['lang'], 'ru')
 
-        response = client.get(self.login_url, HTTP_ACCEPT_LANGUAGE='de,es;q=0.9')
+        response = client.get('/', HTTP_ACCEPT_LANGUAGE='de,es;q=0.9')
         self.assertEqual(to_soup(response.content).html['lang'], 'ru')
 
-        response = self.client_class().get(self.login_url)
+        response = self.client_class().get('/')
         self.assertEqual(to_soup(response.content).html['lang'], 'en')
 
-        response = self.client_class().get(self.login_url, HTTP_ACCEPT_LANGUAGE='de,es;q=0.9')
+        response = self.client_class().get('/', HTTP_ACCEPT_LANGUAGE='de,es;q=0.9')
         self.assertEqual(to_soup(response.content).html['lang'], 'en')
 
     def test_server_translation(self):
@@ -3413,6 +3312,16 @@ def test_server_translation(self):
                          'Перевод, который может быть перезаписан серверным переводом')
         self.assertEqual(ru_lang_obj.translate('Some shared translation'), 'Серверный перевод имеет более высокий приоритет')
 
+    def test_error_keys_are_not_translated(self):
+        response = self.client_class().post(
+            '/api/oauth2/confirm_email/?lang=ru',
+            data={'code': 'invalid'},
+            content_type='application/json',
+        )
+        self.assertDictEqual(
+            response.json(),
+            {'code': ['Код подтверждения недействителен или устарел.']},
+        )
 
 class ProjectTestCase(BaseTestCase):
     use_msgpack = True
@@ -5697,13 +5606,11 @@ def test_external_custom_models(self):
 
     def test_additional_urls(self):
         response = self.client.get('/suburls/admin/login/')
-        self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, self.login_url)
+        self.assertEqual(response.status_code, 200)
         response = self.client.get('/suburls_module/admin/login/')
-        self.assertEqual(response.status_code, 302)
-        self.assertRedirects(response, self.login_url)
+        self.assertEqual(response.status_code, 200)
         response = self.client.get(f'/suburls/login/')
-        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.status_code, 200)
 
 
 class ToolsTestCase(BaseTestCase):
@@ -5795,7 +5702,7 @@ def test_file_reader(self):
         self.assertEqual(settings.LDAP_DOMAIN, '')
         self.assertEqual(settings.LDAP_FORMAT, 'cn=<username>,<domain>')
         self.assertEqual(settings.TIME_ZONE, "UTC")
-        self.assertEqual(settings.ENABLE_ADMIN_PANEL, False)
+        self.assertEqual(settings.ENABLE_ADMIN_PANEL, True)
 
         self.assertEqual(settings.SESSION_COOKIE_AGE, 1209600)
         self.assertEqual(settings.STATIC_URL, '/static/')
@@ -6637,3 +6544,1001 @@ def test_test_utils(self):
         self.assertEqual(device._sub.language_code, 'en')
         device.set_language('ru')
         self.assertEqual(device._sub.language_code, 'ru')
+
+
+class Oauth2TestCase(BaseTestCase):
+    maxDiff = None
+
+    def test_configuration(self):
+        # Check that OAUTH_SERVER_URL or OAUTH_SERVER_ENABLE must be set
+        with (
+            override_settings(
+                OAUTH_SERVER_URL=None,
+                OAUTH_SERVER_ENABLE=False,
+            ),
+            self.assertRaisesRegex(
+                SystemCheckError,
+                'OAUTH_SERVER_URL or OAUTH_SERVER_ENABLE must be set',
+            ),
+        ):
+            call_command('check')
+
+    def access_token_tester(self, prepare_data):
+        user = self._create_user(is_super_user=False, is_staff=False)
+        client = self.client_class()
+
+        # Missing grant_type
+        response = client.post(
+            '/api/oauth2/token/',
+            **prepare_data({}),
+        )
+        self.assertEqual(response.status_code, 400)
+        self.assertDictEqual(response.json(), {'error': 'unsupported_grant_type'})
+
+        # Invalid password
+        response = client.post(
+            '/api/oauth2/token/',
+            **prepare_data({
+                'client_id': 'simple-client-id',
+                'client_secret': 'simple-client-secret',
+                'grant_type': 'password',
+                'username': user.username,
+                'password': 'invalid',
+            }),
+        )
+        self.assertEqual(response.status_code, 400, response.json())
+        self.assertDictEqual(response.json(), {
+            'error': 'invalid_request',
+            'error_description': 'Invalid "username" or "password" in request.'},
+        )
+
+        # Valid data
+        with (
+            self.patch('time.time', return_value=1000),
+            self.patch('vstutils.oauth2.authorization_server.JWTBearerTokenGenerator._get_expires_in', return_value=60),
+        ):
+            response = client.post(
+                '/api/oauth2/token/',
+                **prepare_data({
+                    'client_id': 'simple-client-id',
+                    'client_secret': 'simple-client-secret',
+                    'grant_type': 'password',
+                    'username': user.username,
+                    'password': user.data['password'],
+                }),
+            )
+        data = response.json()
+        self.assertEqual(response.status_code, 200, data)
+        self.assertDictEqual(data, {
+            'access_token': data['access_token'],
+            'expires_in': 60,
+            'refresh_token': data['refresh_token'],
+            'token_type': 'Bearer',
+        })
+
+        # Check token
+        token = response.json()['access_token']
+        with self.patch('time.time', return_value=1000):
+            response = client.get(
+                '/api/v1/user/profile/',
+                HTTP_AUTHORIZATION=f'Bearer {token}',
+            )
+        self.assertEqual(response.status_code, 200, response.json())
+        self.assertEqual(response.json()['id'], user.id)
+
+        # Check claims
+        claims = jwt.decode(
+            token,
+            key=oauth2_server_jwk_set,
+        )
+        self.assertDictEqual(claims, {
+            'jti': claims['jti'],
+            'session_key': claims['session_key'],
+            'iss': 'https://test_proj.vst',
+            'exp': 1060,
+            'client_id': 'simple-client-id',
+            'iat': 1000,
+            'scope': None,
+            'sub': f'{user.id}',
+            'aud':'simple-client-id',
+            'sup': False,
+        })
+
+        # Check token after expiration
+        with self.patch('time.time', return_value=1061):
+            response = client.get(
+                '/api/v1/user/profile/',
+                HTTP_AUTHORIZATION=f'Bearer {token}',
+            )
+        self.assertEqual(response.status_code, 401, response.json())
+        self.assertDictEqual(response.json(), {
+            'error': 'invalid_token',
+            'error_description': 'The access token provided is expired, revoked, malformed, or invalid for other reasons.',
+        })
+        self.assertDictEqual(dict(response.headers), {
+            **response.headers,
+            'Content-Type': 'application/json; charset=utf-8',
+            'WWW-Authenticate': 'Bearer extra_attributes="{}", error="invalid_token", error_description="The access token provided is expired, revoked, malformed, or invalid for other reasons."',
+        })
+
+    def test_access_token_json(self):
+        def prepare_data(data: dict):
+            return {
+                'content_type': 'application/json',
+                'data': data,
+            }
+
+        self.access_token_tester(prepare_data)
+
+    def test_access_token_urlencoded(self):
+        def prepare_data(data: dict):
+            return {
+                'content_type': 'application/x-www-form-urlencoded',
+                'data': urlencode(data),
+            }
+        self.access_token_tester(prepare_data)
+
+
+    def test_login_with_second_factor(self):
+        user = self._create_user(is_super_user=False, is_staff=False)
+        TwoFactor.objects.create(user=user, secret='ABCDE')
+        auth_data = {
+            'client_id': 'simple-client-id',
+            'client_secret': 'simple-client-secret',
+            'grant_type': 'password',
+            'username': user.username,
+            'password': user.data['password'],
+        }
+
+        # Missing second factor
+        response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data=auth_data)
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json(), {
+            'error': 'invalid_request',
+            'error_description': 'Missing or invalid "second_factor" in request.',
+            'second_factor_missing_or_invalid': True,
+        })
+
+        # Invalid second factor
+        with self.patch('pyotp.TOTP.verify', return_value=False):
+            response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
+                **auth_data,
+                'second_factor': 123456,
+            })
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.json(), {
+            'error': 'invalid_request',
+            'error_description': 'Missing or invalid "second_factor" in request.',
+            'second_factor_missing_or_invalid': True,
+        })
+
+        # Valid second factor
+        with self.patch('pyotp.TOTP.verify', return_value=True):
+            response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
+                **auth_data,
+                'second_factor': 123456,
+            })
+        self.assertEqual(response.status_code, 200)
+
+
+    def test_refresh_token_revocation(self):
+        user = self._create_user(is_super_user=False, is_staff=False)
+
+        # Create refresh_token
+        response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
+            'client_id': 'simple-client-id',
+            'client_secret': 'simple-client-secret',
+            'grant_type': 'password',
+            'username': user.username,
+            'password': user.data['password'],
+        })
+        refresh_token = response.json()['refresh_token']
+        self.assertTrue(refresh_token)
+
+        # Revoke refresh_token
+        response = self.client_class().post('/api/oauth2/revoke/', content_type='application/json', data={
+            'client_id': 'simple-client-id',
+            'client_secret': 'simple-client-secret',
+            'token': refresh_token,
+        })
+        self.assertEqual(response.status_code, 200)
+
+        # Check refresh token
+        response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
+            'grant_type': 'refresh_token',
+            'client_id': 'simple-client-id',
+            'client_secret': 'simple-client-secret',
+            'refresh_token': refresh_token,
+        })
+        data = response.json()
+        self.assertEqual(response.status_code, 400, data)
+        self.assertDictEqual(data, {
+            'error': 'invalid_request',
+            'error_description': 'There is no "user" for this token.'},
+        )
+
+        # Invocation endpoint must return 200 for unknown token
+        response = self.client_class().post('/api/oauth2/revoke/', content_type='application/json', data={
+            'client_id': 'simple-client-id',
+            'client_secret': 'simple-client-secret',
+            'token': 'unknown',
+        })
+        self.assertEqual(response.status_code, 200)
+
+    def test_refresh_token(self):
+        def refresh_token_tester(username: str, password: str, anon = False):
+            # Create refresh_token
+            response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
+                'client_id': 'simple-client-id',
+                'client_secret': 'simple-client-secret',
+                'grant_type': 'password',
+                'username': username,
+                'password': password,
+            })
+            refresh_token = response.json()['refresh_token']
+            self.assertTrue(refresh_token)
+
+            # Refresh token
+            response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
+                'grant_type': 'refresh_token',
+                'client_id': 'simple-client-id',
+                'client_secret': 'simple-client-secret',
+                'refresh_token': refresh_token,
+            })
+            data = response.json()
+            self.assertEqual(response.status_code, 200, data)
+
+            # Check new token
+            response = self.client_class().get(
+                '/api/oauth2/userinfo/',
+                HTTP_AUTHORIZATION=f'Bearer {data["access_token"]}',
+            )
+            self.assertEqual(response.status_code, 200)
+            if anon:
+                self.assertEqual(response.json()['anon'], True)
+            else:
+                self.assertEqual(response.json()['preferred_username'], username)
+
+            # Check invalid refresh token
+            response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
+                'grant_type': 'refresh_token',
+                'client_id': 'simple-client-id',
+                'client_secret': 'simple-client-secret',
+                'refresh_token': 'invalid',
+            })
+            data = response.json()
+            self.assertEqual(response.status_code, 400, data)
+            self.assertDictEqual(data, {
+                'error': 'invalid_grant',
+            })
+
+        user = self._create_user(is_super_user=False, is_staff=False)
+        with self.subTest('Not anonyuous user'):
+            refresh_token_tester(
+                username=user.username,
+                password=user.data['password'],
+            )
+
+        with self.subTest('Anonyuous user'):
+            refresh_token_tester(
+                username='',
+                password='',
+                anon=True,
+            )
+
+    def test_session(self):
+        def session_tester(username: str, password: str):
+            user = self._create_user(is_super_user=False, is_staff=False)
+            auth_data = {
+                'client_id': 'simple-client-id',
+                'client_secret': 'simple-client-secret',
+                'grant_type': 'password',
+                'username': user.username,
+                'password': user.data['password'],
+            }
+
+            # Login
+            token1 = self.client_class() \
+                .post('/api/oauth2/token/', content_type='application/json', data=auth_data).json()['access_token']
+            token2 = self.client_class() \
+                .post('/api/oauth2/token/', content_type='application/json', data=auth_data).json()['access_token']
+
+            # Check value on token1
+            response = self.client_class().get('/api/v1/oauth2_tests/counter/', HTTP_AUTHORIZATION=f'Bearer {token1}')
+            self.assertEqual(response.json(), {'value': 0})
+
+            # Increment value in token1
+            response = self.client_class().post('/api/v1/oauth2_tests/counter/', HTTP_AUTHORIZATION=f'Bearer {token1}')
+
+            # Check incremented value in token1
+            response = self.client_class().get('/api/v1/oauth2_tests/counter/', HTTP_AUTHORIZATION=f'Bearer {token1}')
+            self.assertEqual(response.json(), {'value': 1})
+
+            # Check value in token2
+            response = self.client_class().get('/api/v1/oauth2_tests/counter/', HTTP_AUTHORIZATION=f'Bearer {token2}')
+            self.assertEqual(response.json(), {'value': 0})
+
+        # User
+        user = self._create_user(is_super_user=False, is_staff=False)
+        with self.subTest('Logged in user'):
+            session_tester(user.username, user.data['password'])
+
+        # Anonymous user
+        with self.subTest('Anonymous user'):
+            session_tester('', '')
+
+        # Disabled session middleware
+        user = self._create_user(is_super_user=False, is_staff=False)
+        with self.subTest('Logged in user without session miffleware'):
+            with override_settings(
+                MIDDLEWARE=[
+                    middleware
+                    for middleware in settings.MIDDLEWARE
+                    if middleware not in {
+                        'django.contrib.sessions.middleware.SessionMiddleware',
+                        'django.contrib.auth.middleware.AuthenticationMiddleware',
+                        'django.contrib.messages.middleware.MessageMiddleware',
+                    }
+                ]
+            ):
+                session_tester(user.username, user.data['password'])
+
+    def test_anon_user_login(self):
+        # Obtain token
+        response = self.client_class().post(
+            '/api/oauth2/token/',
+            content_type='application/json',
+            data={
+                'client_id': 'simple-client-id',
+                'client_secret': 'simple-client-secret',
+                'grant_type': 'password',
+                'username': '',
+                'password': '',
+            },
+        )
+        self.assertEqual(response.status_code, 200)
+        access_token = response.json()['access_token']
+
+        # Assert claims
+        access_token_jwt = jwt.decode(
+            access_token,
+            oauth2_server_jwk_set,
+        )
+        self.maxDiff = None
+        self.assertDictEqual(access_token_jwt, {
+            'exp': access_token_jwt['exp'],
+            'iat': access_token_jwt['iat'],
+            'session_key': access_token_jwt['session_key'],
+            'sub': access_token_jwt['sub'],
+            'jti': access_token_jwt['jti'],
+            'anon': True,
+            'aud': 'simple-client-id',
+            'client_id': 'simple-client-id',
+            'iss': 'https://test_proj.vst',
+            'scope': None,
+            'sup': False
+        })
+
+        # Test token introspection endpoint
+        response = self.client_class().post(
+            '/api/oauth2/introspect/',
+            content_type='application/json',
+            data={
+                'client_id': 'simple-client-id',
+                'client_secret': 'simple-client-secret',
+                'token': access_token,
+            },
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json(), {
+            'active': True,
+            'sub': access_token_jwt['sub'],
+        })
+
+        # Test user info endpoint
+        response = self.client_class().get(
+            '/api/oauth2/userinfo/',
+            headers={'Authorization': f'Bearer {access_token}'},
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertDictEqual(response.json(), {
+            "sub": access_token_jwt['sub'],
+            "anon": True,
+        })
+
+    def test_schema(self):
+        response = self.client_class().get(
+            '/api/oauth2/_openapi/',
+            headers={'Accept': 'application/json'},
+        )
+        self.assertEqual(response.status_code, 200)
+        schema = response.json()
+
+        self.assertDictEqual(schema['securityDefinitions']['oauth2'], {
+            'type': 'oauth2',
+            'flow': 'password',
+            'tokenUrl': 'http://testserver/api/oauth2/token/',
+            'scopes': {},
+        })
+
+        self.assertDictEqual(schema['paths']['/userinfo/'], {
+            "get": {
+                "consumes": ["application/json"],
+                "description": "",
+                "operationId": "userinfo",
+                "parameters": [],
+                "responses": {
+                    "200": {
+                        "description": "User info",
+                        "schema": {
+                            "properties": {
+                                "email": {"type": "string"},
+                                "family_name": {"type": "string"},
+                                "given_name": {"type": "string"},
+                                "name": {"type": "string"},
+                                "preferred_username": {"type": "string"},
+                                "sub": {"type": "string"},
+                                "anon": {"type": "boolean"},
+                            },
+                            "required": ["sub"],
+                            "type": "object",
+                        },
+                    }
+                },
+                "tags": ["userinfo"],
+                "x-list": True,
+            },
+            "parameters": [],
+        })
+
+        self.assertDictEqual(schema['paths']['/token/'], {
+            "parameters": [],
+            "post": {
+                "consumes": ["application/json"],
+                "description": "",
+                "operationId": "get_token",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "data",
+                        "required": True,
+                        "schema": {
+                            "properties": {
+                                "client_id": {"type": "string"},
+                                "client_secret": {"type": "string"},
+                                "grant_type": {"enum": ["password"], "type": "string"},
+                                "password": {"type": "string"},
+                                "second_factor": {"type": "string"},
+                                "username": {"type": "string"},
+                            },
+                            "required": [
+                                "grant_type",
+                                "username",
+                                "password",
+                            ],
+                            "type": "object",
+                        },
+                    }
+                ],
+                "responses": {
+                    "200": {"description": "Token response"},
+                    "400": {
+                        "description": "Bad request",
+                        "schema": {
+                            "additionalProperties": True,
+                            "properties": {
+                                "error": {"type": "string"},
+                                "error_description": {"type": "string"},
+                                "second_factor_missing_or_invalid": {"type": "boolean"},
+                            },
+                            "required": ["error"],
+                            "type": "object",
+                        },
+                    },
+                },
+                "tags": ["token"],
+            },
+        })
+
+        self.assertDictEqual(schema['paths']['/introspect/'], {
+            "parameters": [],
+            "post": {
+                "consumes": ["application/json"],
+                "description": "",
+                "operationId": "token_introspection",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "data",
+                        "required": True,
+                        "schema": {
+                            "properties": {
+                                "token": {"type": "string"},
+                                "token_type_hint": {"type": "string"},
+                            },
+                            "required": ["token"],
+                            "type": "object",
+                        },
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Token introspection",
+                        "schema": {
+                            "properties": {
+                                "active": {"type": "boolean"},
+                                "aud": {"type": "string"},
+                                "client_id": {"type": "string"},
+                                "exp": {"type": "integer"},
+                                "iat": {"type": "integer"},
+                                "iss": {"type": "string"},
+                                "jti": {"type": "string"},
+                                "nbf": {"type": "integer"},
+                                "scope": {"type": "string"},
+                                "sub": {"type": "string"},
+                                "token_type": {"type": "string"},
+                                "username": {"type": "string"},
+                            },
+                            "required": ["active"],
+                            "type": "object",
+                        },
+                    }
+                },
+                "tags": ["introspect"],
+            },
+        })
+
+        self.assertDictEqual(schema['paths']['/revoke/'], {
+            "parameters": [],
+            "post": {
+                "consumes": ["application/json"],
+                "description": "",
+                "operationId": "revoke_token",
+                "parameters": [
+                    {
+                        "in": "body",
+                        "name": "data",
+                        "required": True,
+                        "schema": {
+                            "properties": {
+                                "token": {"type": "string"},
+                                "token_type_hint": {"type": "string"},
+                            },
+                            "required": ["token"],
+                            "type": "object",
+                        },
+                    }
+                ],
+                "responses": {"200": {"description": "Token revoked"}},
+                "tags": ["revoke"],
+            },
+        })
+
+    def test_metadata_endpoints(self):
+        client = self.api_test_client
+
+        response = client.get('/.well-known/oauth-authorization-server')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.headers['Content-Type'], 'application/json')
+        self.assertDictEqual(response.json(), {
+            'issuer': 'https://vstutilstestserver',
+            'response_types_supported': ['token', 'code'],
+            'grant_types_supported': ['password', 'authorization_code'],
+            'authorization_endpoint': 'https://some-server/auth',
+            'token_endpoint': 'https://vstutilstestserver/api/oauth2/token/',
+            'revocation_endpoint': 'https://vstutilstestserver/api/oauth2/revoke/',
+            'introspection_endpoint': 'https://vstutilstestserver/api/oauth2/introspect/',
+        })
+
+        response = client.get('/.well-known/openid-configuration')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.headers['Content-Type'], 'application/json')
+        self.assertDictEqual(response.json(), {
+            'issuer': 'https://vstutilstestserver',
+            'response_types_supported': ['token', 'code'],
+            'grant_types_supported': ['password', 'authorization_code'],
+            'authorization_endpoint': 'https://some-server/auth',
+            'token_endpoint': 'https://vstutilstestserver/api/oauth2/token/',
+            'revocation_endpoint': 'https://vstutilstestserver/api/oauth2/revoke/',
+            'introspection_endpoint': 'https://vstutilstestserver/api/oauth2/introspect/',
+            'userinfo_endpoint': 'https://vstutilstestserver/api/oauth2/userinfo/',
+        })
+
+    def test_userinfo(self):
+        user = self._create_user(
+            is_super_user=False,
+            is_staff=False,
+            first_name='Jane',
+            last_name='Doe',
+            email='janedoe@example.com',
+            username='j.doe'
+        )
+        token = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
+            'client_id': 'simple-client-id',
+            'client_secret': 'simple-client-secret',
+            'grant_type': 'password',
+            'username': user.username,
+            'password': user.data['password'],
+        }).json()['access_token']
+
+        response = self.client_class().get('/api/oauth2/userinfo/', HTTP_AUTHORIZATION=f'Bearer {token}')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.headers['Content-Type'], 'application/json; charset=utf-8')
+        self.assertDictEqual(response.json(), {
+            "sub": f"{user.id}",
+            "name": "Jane Doe",
+            "given_name": "Jane",
+            "family_name": "Doe",
+            "preferred_username": "j.doe",
+            "email": "janedoe@example.com",
+        })
+
+    def test_auth_with_scope(self):
+        user = self._create_user(is_super_user=False, is_staff=False,)
+        response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
+            'client_id': 'simple-client-id',
+            'client_secret': 'simple-client-secret',
+            'grant_type': 'password',
+            'username': user.username,
+            'password': user.data['password'],
+            'scope': 'openid'
+        })
+        self.assertEqual(response.status_code, 200)
+        access_token_jwt = jwt.decode(
+            response.json()['access_token'],
+            oauth2_server_jwk_set,
+        )
+        self.assertEqual(access_token_jwt['scope'], 'openid')
+
+    def test_token_introspection_endpoint(self):
+        # Check invalid token
+        response = self.client_class().post('/api/oauth2/introspect/', content_type='application/json', data={
+            'client_id': 'simple-client-id',
+            'client_secret': 'simple-client-secret',
+            'token': 'abc',
+        })
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json(), {
+            'active': False,
+        })
+
+        # Check valid token
+        user = self._create_user(is_super_user=False, is_staff=False,)
+        response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
+            'client_id': 'simple-client-id',
+            'client_secret': 'simple-client-secret',
+            'grant_type': 'password',
+            'username': user.username,
+            'password': user.data['password'],
+        })
+        self.assertEqual(response.status_code, 200)
+        access_token = response.json()['access_token']
+
+        response = self.client_class().post('/api/oauth2/introspect/', content_type='application/json', data={
+            'client_id': 'simple-client-id',
+            'client_secret': 'simple-client-secret',
+            'token': access_token,
+        })
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json(), {
+            'active': True,
+            'sub': str(user.id),
+        })
+
+    def test_schema_security_definition(self):
+        request = Mock()
+        request.build_absolute_uri = lambda path: f'https://test_proj.vst{path}'
+
+        with override_settings(OAUTH_SERVER_URL='https://some.auth', OAUTH_SERVER_TOKEN_ENDPOINT_PATH='/token'):
+            self.assertDictEqual(
+                get_oauth2_security_definition(request),
+                {
+                    'flow': 'password',
+                    'scopes': {},
+                    'tokenUrl': 'https://some.auth/token',
+                    'type': 'oauth2',
+                },
+            )
+
+        with override_settings(OAUTH_SERVER_URL='https://some-vstutils.auth'):
+            self.assertDictEqual(
+                get_oauth2_security_definition(request),
+                {
+                    'flow': 'password',
+                    'scopes': {},
+                    'tokenUrl': 'https://some-vstutils.auth/api/oauth2/token/',
+                    'type': 'oauth2',
+                },
+            )
+
+        self.assertDictEqual(
+            get_oauth2_security_definition(request),
+            {
+                'flow': 'password',
+                'scopes': {},
+                'tokenUrl': 'https://test_proj.vst/api/oauth2/token/',
+                'type': 'oauth2',
+            },
+        )
+
+        with override_settings(OAUTH_SERVER_SCHEMA_CLIENT_ID='some-client'):
+            self.assertEqual(
+                get_oauth2_security_definition(request)['x-clientId'],
+                'some-client',
+            )
+
+    def test_bulk_request_with_invalid_token(self):
+        response = self.client_class().put(
+            '/api/endpoint/',
+            HTTP_AUTHORIZATION='Bearer invalid_token',
+            content_type='application/json',
+            data=[{'method': 'get', 'path': ['user', 'profile']}],
+        )
+        self.assertEqual(response.status_code, 401)
+        self.assertDictEqual(response.json(), {
+            'error': 'invalid_token',
+            'error_description': 'The access token provided is expired, revoked, malformed, or invalid for other reasons.',
+        })
+
+    @patch('ldap.initialize')
+    @override_settings(LDAP_SERVER='https://ldap.server', LDAP_DOMAIN='ldap.domain')
+    def test_ldap_auth(self, ldap_obj):
+        user = self._create_user(is_super_user=False, is_staff=False, username='ldap_user')
+        user.set_unusable_password()
+        user.save()
+
+        response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
+            'client_id': 'simple-client-id',
+            'client_secret': 'simple-client-secret',
+            'grant_type': 'password',
+            'username': 'ldap_user',
+            'password': 'some_password',
+        }, HTTP_X_AUTH_PLUGIN='LDAP')
+        self.assertEqual(response.status_code, 200)
+        token = response.json()['access_token']
+
+        response = self.client_class().get('/api/v1/user/profile/', HTTP_AUTHORIZATION=f'Bearer {token}')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json()['id'], user.id)
+
+    def test_same_origin_client_auth(self):
+        user = self._create_user(is_super_user=False, is_staff=False)
+        response = self.client_class().post(
+            '/api/oauth2/token/',
+            content_type='application/json',
+            data={
+                'client_id': 'spa',
+                'client_secret': 'spa',
+                'grant_type': 'password',
+                'username': user.username,
+                'password': user.data['password'],
+            },
+            headers={'Sec-Fetch-Site': 'same-origin'},
+        )
+        self.assertEqual(response.status_code, 200)
+
+    def test_authorization_in_vary(self):
+        user = self._create_user(is_super_user=False, is_staff=False)
+        token = self.client_class().post(
+            '/api/oauth2/token/',
+            content_type='application/json',
+            data={
+                'client_id': 'simple-client-id',
+                'client_secret': 'simple-client-secret',
+                'grant_type': 'password',
+                'username': user.username,
+                'password': user.data['password'],
+            },
+        ).json()['access_token']
+
+        response = self.client_class().get(
+            '/api/v1/user/profile/',
+            headers={'authorization': f'Bearer {token}'},
+        )
+        self.assertIn('authorization', response.headers.get('Vary').lower())
+
+    def test_authorization_code_grant_with_pkce(self):
+        user = self._create_user(is_super_user=False, is_staff=False)
+
+        # Invalid client
+        response = authorization_server.create_authorization_response(
+            OAuth2Request(
+                method='GET',
+                uri='https://some-server/auth?' + urlencode({
+                    'client_id': 'other-app',
+                    'redirect_uri': 'https://some-app.com/auth-callback',
+                    'response_type': 'code',
+                    'scope': 'openid',
+                    'state': 'some_state',
+                    'code_challenge': '0f21GTan3vsWzslXdPT7-0lyu_bx3MW-19TvjASR2AA',
+                    'code_challenge_method': 'S256',
+                }),
+            ),
+            grant_user=UserWrapper(user),
+        )
+        self.assertEqual(response.status_code, 400)
+        self.assertDictEqual(
+            json.loads(response.content),
+            {
+                "error": "invalid_client",
+                "state": "some_state",
+            }
+        )
+
+        # Invalid redirect uri
+        response = authorization_server.create_authorization_response(
+            OAuth2Request(
+                method='GET',
+                uri='https://some-server/auth?' + urlencode({
+                    'client_id': 'some-app',
+                    'redirect_uri': 'https://other-app.com/auth-callback',
+                    'response_type': 'code',
+                    'scope': 'openid',
+                    'state': 'some_state',
+                    'code_challenge': '0f21GTan3vsWzslXdPT7-0lyu_bx3MW-19TvjASR2AA',
+                    'code_challenge_method': 'S256',
+                }),
+            ),
+            grant_user=UserWrapper(user),
+        )
+        self.assertEqual(response.status_code, 400)
+        self.assertDictEqual(
+            json.loads(response.content),
+            {
+                "error": "invalid_request",
+                "error_description": "Redirect URI https://other-app.com/auth-callback is not supported by client.",
+                "state": "some_state",
+            }
+        )
+
+        # Missing redirect uri
+        response = authorization_server.create_authorization_response(
+            OAuth2Request(
+                method='GET',
+                uri='https://some-server/auth?' + urlencode({
+                    'client_id': 'some-app',
+                    'response_type': 'code',
+                    'scope': 'openid',
+                    'state': 'some_state',
+                    'code_challenge': '0f21GTan3vsWzslXdPT7-0lyu_bx3MW-19TvjASR2AA',
+                    'code_challenge_method': 'S256',
+                }),
+            ),
+            grant_user=UserWrapper(user),
+        )
+        self.assertEqual(response.status_code, 400)
+        self.assertDictEqual(
+            json.loads(response.content),
+            {
+                "error": "invalid_request",
+                "error_description": 'Missing "redirect_uri" in request.',
+                "state": "some_state",
+            }
+        )
+
+        # Missing auth backend path
+        with self.assertRaisesMessage(ValueError, 'Property "backend" is missing on user instance'):
+            response = authorization_server.create_authorization_response(
+                OAuth2Request(
+                    method='GET',
+                    uri='https://some-server/auth?' + urlencode({
+                        'client_id': 'some-app',
+                        'redirect_uri': 'https://some-app.com/auth-callback',
+                        'response_type': 'code',
+                        'scope': 'openid',
+                        'state': 'some_state',
+                        'code_challenge': '0f21GTan3vsWzslXdPT7-0lyu_bx3MW-19TvjASR2AA',
+                        'code_challenge_method': 'S256',
+                    }),
+                ),
+                grant_user=UserWrapper(user),
+            )
+
+        # Valid request
+        user.backend = 'django.contrib.auth.backends.ModelBackend'
+        response = authorization_server.create_authorization_response(
+            OAuth2Request(
+                method='GET',
+                uri='https://some-server/auth?' + urlencode({
+                    'client_id': 'some-app',
+                    'redirect_uri': 'https://some-app.com/auth-callback',
+                    'response_type': 'code',
+                    'scope': 'openid',
+                    'state': 'some_state',
+                    'code_challenge': '0f21GTan3vsWzslXdPT7-0lyu_bx3MW-19TvjASR2AA',
+                    'code_challenge_method': 'S256',
+                }),
+            ),
+            grant_user=UserWrapper(user),
+        )
+        self.assertEqual(response.status_code, 302)
+        redirect = urlparse(response.headers['Location'])
+        self.assertEqual(redirect.scheme, 'https')
+        self.assertEqual(redirect.netloc, 'some-app.com')
+        self.assertEqual(redirect.path, '/auth-callback')
+        query = parse_qs(redirect.query)
+        self.assertEqual(query['state'], ['some_state'])
+        self.assertIn('code', query)
+
+        # Try exchange code for token with missing code_verifier
+        response = self.client_class().post(
+            '/api/oauth2/token/',
+            content_type='application/json',
+            data={
+                'client_id': 'some-app',
+                'grant_type': 'authorization_code',
+                'code': query['code'][0],
+                'redirect_uri': 'https://some-app.com/auth-callback',
+            },
+        )
+        self.assertEqual(response.status_code, 400)
+        self.assertDictEqual(
+            response.json(),
+            {'error': 'invalid_request', 'error_description': 'Missing "code_verifier"'},
+        )
+
+        # Exchange code for token
+        response = self.client_class().post(
+            '/api/oauth2/token/',
+            content_type='application/json',
+            data={
+                'client_id': 'some-app',
+                'grant_type': 'authorization_code',
+                'code': query['code'][0],
+                'redirect_uri': 'https://some-app.com/auth-callback',
+                'code_verifier': '0efce59c515c441290b0a36881664a8fc2e22a2923c04c54a4bc2b1e7794dbba7a25d0c8e0d24d30bdf7179af0d8213c',
+            },
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertSetEqual(
+            set(response.json().keys()),
+            {'access_token', 'expires_in', 'scope', 'id_token', 'token_type'},
+        )
+
+        # Try use same code second time
+        response = self.client_class().post(
+            '/api/oauth2/token/',
+            content_type='application/json',
+            data={
+                'client_id': 'some-app',
+                'grant_type': 'authorization_code',
+                'code': query['code'][0],
+                'redirect_uri': 'https://some-app.com/auth-callback',
+                'code_verifier': '0efce59c515c441290b0a36881664a8fc2e22a2923c04c54a4bc2b1e7794dbba7a25d0c8e0d24d30bdf7179af0d8213c',
+            },
+        )
+        self.assertEqual(response.status_code, 400)
+        self.assertDictEqual(
+            response.json(),
+            {'error': 'invalid_grant', 'error_description': 'Invalid "code" in request.'},
+        )
+
+    def test_bulk_request_will_not_revoke_token(self):
+        user = self._create_user(is_super_user=False, is_staff=False,)
+        response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
+            'client_id': 'simple-client-id',
+            'client_secret': 'simple-client-secret',
+            'grant_type': 'password',
+            'username': user.username,
+            'password': user.data['password'],
+        })
+        self.assertEqual(response.status_code, 200)
+        access_token = response.json()['access_token']
+
+        # Make bulk request
+        response = self.client_class().put(
+            '/api/endpoint/',
+            content_type='application/json',
+            headers={'authorization': f'Bearer {access_token}'},
+            data=[
+                {'method': 'get', 'path': ['user', 'profile']},
+            ],
+        )
+        self.assertEqual(response.json()[0]['status'], 200)
+
+        # Check token is still valid
+        response = self.client_class().get(
+            '/api/v1/user/profile/',
+            headers={'authorization': f'Bearer {access_token}'},
+        )
+        self.assertEqual(response.status_code, 200)
diff --git a/test_src/test_proj/views.py b/test_src/test_proj/views.py
index d4ca94a8..2be3dbea 100644
--- a/test_src/test_proj/views.py
+++ b/test_src/test_proj/views.py
@@ -3,12 +3,13 @@
 import json
 
 from django.utils.functional import SimpleLazyObject
+from rest_framework.permissions import AllowAny
 
 from vstutils.api import responses, filter_backends, fields
 from vstutils.api.views import SettingsViewSet
-from vstutils.api.base import NonModelsViewSet
+from vstutils.api.base import GenericViewSet, NonModelsViewSet
 from vstutils.api.decorators import action, nested_view, subaction, extend_filterbackends
-from vstutils.api.serializers import DataSerializer, JsonObjectSerializer
+from vstutils.api.serializers import DataSerializer, JsonObjectSerializer, EmptySerializer
 from vstutils.api.auth import UserViewSet
 from vstutils.api.actions import Action, SimpleFileAction
 from vstutils.utils import create_view
@@ -250,3 +251,19 @@ def test_json_serializer(self, request, *_, **__):
 class CacheableViewSet(CacheableView):
     def get_etag_value(self, model_class, request):
         return super().get_etag_value((model_class, gui_version), request)
+
+
+
+class TestOauth2ViewSet(GenericViewSet):
+    serializer_class = EmptySerializer
+    permission_classes = [AllowAny]
+
+    @subaction(methods=['POST', 'GET'], detail=False)
+    def counter(self, request):
+        value = request.session.get('test_counter', 0)
+        if request.method == 'POST':
+            value += 1
+            request.session['test_counter'] = value
+        # Some tests run with session middleware disabled so it needs to be saved manually
+        request.session.save()
+        return responses.Response200({'value': value})
diff --git a/tox_build.ini b/tox_build.ini
index e8c827c0..30aeb87c 100644
--- a/tox_build.ini
+++ b/tox_build.ini
@@ -31,7 +31,7 @@ deps =
     -rrequirements-doc.txt
     jsmin~=3.0.0
     csscompressor==0.9.5
-    vstcompile~=2.0
+    vstcompile~=3.0
 
 [testenv:auditwheel]
 basepython = python3.11
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index ac415434..99cbee73 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.9.5'
+__version__: str = '5.10.0b1'
diff --git a/vstutils/api/__init__.py b/vstutils/api/__init__.py
index 9c370451..0690b4d0 100644
--- a/vstutils/api/__init__.py
+++ b/vstutils/api/__init__.py
@@ -1,8 +1,19 @@
+from django.conf import settings
+from django.core.checks import Error, register
 from django.utils.module_loading import autodiscover_modules
 
-
 default_app_config: str = 'vstutils.api.apps.VSTUtilsAppConfig'
 
 
 def autodiscover():
     autodiscover_modules()
+
+
+@register()
+def check_oauth2_configuration(app_configs, **kwargs):
+    errors = []
+    if not settings.OAUTH_SERVER_URL and not settings.OAUTH_SERVER_ENABLE:
+        errors.append(
+            Error('OAUTH_SERVER_URL or OAUTH_SERVER_ENABLE must be set')
+        )
+    return errors
diff --git a/vstutils/api/auth.py b/vstutils/api/auth.py
index 379dbc7f..67ed6dd8 100644
--- a/vstutils/api/auth.py
+++ b/vstutils/api/auth.py
@@ -13,7 +13,7 @@
 from rest_framework import serializers, exceptions, request as drf_request
 from vstutils.api import fields, base, permissions, responses, decorators as deco
 from vstutils.api.filters import DefaultIDFilter, name_filter, name_help
-from vstutils.api.serializers import VSTSerializer, BaseSerializer, update_declared_fields
+from vstutils.api.serializers import VSTSerializer, BaseSerializer, update_declared_fields, JsonObjectSerializer
 from vstutils.api.models import TwoFactor, RecoveryCode, UserSettings
 from vstutils.utils import raise_context_decorator_with_default, translate, lazy_translate as __
 
@@ -211,7 +211,7 @@ class Meta:
 
 class UserSettingsSerializer(BaseSerializer):
     main = MainSettingsSerializer(default={})
-    custom = serializers.JSONField(default={})
+    custom = JsonObjectSerializer(default={})
 
     class Meta:
         ref_name = '_UserSettings'
diff --git a/vstutils/api/base.py b/vstutils/api/base.py
index 74bf8559..a8d96ef6 100644
--- a/vstutils/api/base.py
+++ b/vstutils/api/base.py
@@ -79,7 +79,8 @@ def apply_translation(obj, trans_function):
     recursive_call = partial(apply_translation, trans_function=trans_function)
     if isinstance(obj, dict):
         return {
-            trans_function(k): recursive_call(v)
+            # Key must not be translated in order to properly handle errors on frontend.
+            k: recursive_call(v)
             for k, v in obj.items()
         }
     elif isinstance(obj, (tuple, list)):
@@ -167,6 +168,9 @@ def exception_handler(exc, context):
         serializer_class = OtherErrorsSerializer
         logger.debug(traceback_str)
 
+    if isinstance(exc, vstexceptions.HttpResponseException):
+        return exc.get_response()
+
     if data is not None:
         serializer = serializer_class(data=data)
         try:
@@ -535,8 +539,8 @@ def get_etag_value(view, model_class, request, pk=None):
         if EtagDependency.USER in dependencies:
             etag_value += f'_{request.user.id or 0}'
             should_hash = True
-        if EtagDependency.SESSION in dependencies:
-            etag_value += f'_{request.session.session_key}'
+        if EtagDependency.SESSION in dependencies and (session := getattr(request, 'session', None)):
+            etag_value += f'_{session.session_key}'
             should_hash = True
     else:
         etag_value = f'{model_class}_{hashlib.blake2s(ver.encode(settings.DEFAULT_CHARSET), digest_size=4).hexdigest()}'
diff --git a/vstutils/api/endpoint.py b/vstutils/api/endpoint.py
index 4dd78ab8..f970ea59 100644
--- a/vstutils/api/endpoint.py
+++ b/vstutils/api/endpoint.py
@@ -28,6 +28,7 @@
 from .renderers import ORJSONRenderer
 from ..utils import Dict, raise_context, patch_gzip_response
 from ..middleware import BaseMiddleware
+from ..oauth2.authentication import JWTBearerTokenAuthentication
 
 RequestType = _t.Union[drf_request.Request, HttpRequest]
 logger: logging.Logger = logging.getLogger('vstutils')
@@ -42,7 +43,8 @@
 default_authentication_classes = (
     SessionAuthentication,
     BasicAuthentication,
-    TokenAuthentication
+    TokenAuthentication,
+    JWTBearerTokenAuthentication,
 )
 
 append_to_list = list.append
@@ -375,7 +377,11 @@ def original_environ_data(self, request: BulkRequestType, *args) -> _t.Dict:
         if request.user.is_authenticated:
             if isinstance(request.successful_authenticator, SessionAuthentication):
                 kwargs['HTTP_COOKIE'] = str(request.META.get('HTTP_COOKIE'))
-            elif isinstance(request.successful_authenticator, (BasicAuthentication, TokenAuthentication)):
+            elif isinstance(request.successful_authenticator, (
+                BasicAuthentication,
+                TokenAuthentication,
+                JWTBearerTokenAuthentication,
+            )):
                 kwargs['HTTP_AUTHORIZATION'] = str(request.META.get('HTTP_AUTHORIZATION'))
             kwargs['user'] = request.user
         kwargs['language'] = getattr(request, 'language', None)
diff --git a/vstutils/api/password_reset.py b/vstutils/api/password_reset.py
new file mode 100644
index 00000000..9d18bf9d
--- /dev/null
+++ b/vstutils/api/password_reset.py
@@ -0,0 +1,154 @@
+import unicodedata
+from base64 import urlsafe_b64decode, urlsafe_b64encode
+
+from django.conf import settings
+from django.contrib.auth import get_user_model, password_validation
+from django.contrib.auth.tokens import default_token_generator
+from django.core.exceptions import ValidationError as DjangoValidationError
+from django.template import loader
+from django.utils.encoding import force_bytes
+from rest_framework import fields
+from rest_framework.exceptions import ValidationError
+from rest_framework.mixins import CreateModelMixin
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.throttling import AnonRateThrottle
+from vstutils.api.base import GenericViewSet
+from vstutils.api.fields import PasswordField
+from vstutils.api.serializers import BaseSerializer
+from vstutils.utils import (
+    send_template_email,
+    lazy_translate as __,
+    translate as _,
+)
+
+
+User = get_user_model()
+
+
+class PasswordResetThrottle(AnonRateThrottle):
+    scope = "password_reset"
+
+
+def _unicode_ci_compare(s1, s2):
+    """
+    Perform case-insensitive comparison of two identifiers, using the
+    recommended algorithm from Unicode Technical Report 36, section
+    2.11.2(B)(2).
+    """
+    return (
+        unicodedata.normalize("NFKC", s1).casefold() ==
+        unicodedata.normalize("NFKC", s2).casefold()
+    )
+
+
+class PasswordResetSerializer(BaseSerializer):
+    email = fields.EmailField(write_only=True)
+
+    subject_template_name = "registration/password_reset_subject.txt"
+    email_template_name = "registration/api_password_reset_email.html"
+
+    def create(self, validated_data):
+        """
+        Generate a one-use only link for resetting password and send it to the
+        user.
+        """
+        email = validated_data["email"]
+
+        email_field_name = User.get_email_field_name()
+        for user in self.get_users(email):
+            user_email = getattr(user, email_field_name)
+            context = {
+                "email": user_email,
+                "site_name": settings.PROJECT_GUI_NAME,
+                "user": user,
+                "reset_link": self.get_reset_link(
+                    uid=urlsafe_b64encode(force_bytes(user.pk)).decode(),
+                    token=default_token_generator.make_token(user),
+                ),
+            }
+            subject = loader.render_to_string(self.subject_template_name, context)
+            # Email subject *must not* contain newlines
+            subject = "".join(subject.splitlines())
+            send_template_email(
+                subject=__(subject),
+                template_name=self.email_template_name,
+                email=user_email,
+                context_data=context,
+            )
+
+        return {}
+
+    def get_users(self, email):
+        """Given an email, return matching user(s) who should receive a reset.
+
+        This allows subclasses to more easily customize the default policies
+        that prevent inactive users and users with unusable passwords from
+        resetting their password.
+        """
+        email_field_name = User.get_email_field_name()
+        active_users = User.objects.filter(
+            **{
+                f"{email_field_name}__iexact": email,
+                "is_active": True,
+            }
+        )
+        return (
+            u
+            for u in active_users
+            if u.has_usable_password() and
+            _unicode_ci_compare(email, getattr(u, email_field_name))
+        )
+
+    def get_reset_link(self, uid: str, token: str):
+        return self.context["request"].build_absolute_uri(
+            settings.DEFAULT_PASSWORD_RESET_VIEW_CONFIRMATION_LINK.format(
+                uid=uid, token=token
+            )
+        )
+
+
+class PasswordResetConfirmSerializer(BaseSerializer):
+    uid = fields.CharField(write_only=True)
+    token = fields.CharField(write_only=True)
+    password = PasswordField(write_only=True)
+
+    def validate_uid(self, value):
+        try:
+            uid = urlsafe_b64decode(force_bytes(value))
+            return User.objects.get(pk=uid)
+        except (TypeError, ValueError, OverflowError, User.DoesNotExist) as e:
+            raise ValidationError(_("Invalid value")) from e
+
+    def validate(self, attrs):
+        if not default_token_generator.check_token(attrs["uid"], attrs["token"]):
+            raise ValidationError({"token": "Invalid value"})
+
+        try:
+            password_validation.validate_password(attrs["password"], attrs["uid"])
+        except DjangoValidationError as e:
+            raise ValidationError({"password": e.messages}) from e
+
+        return attrs
+
+    def create(self, validated_data):
+        user = validated_data["uid"]
+        user.set_password(validated_data["password"])
+        user.save()
+        return {}
+
+
+class BasePasswordResetViewSet(GenericViewSet, CreateModelMixin):
+    permission_classes = [~IsAuthenticated]
+
+    def get_success_headers(self, data):
+        return {}
+
+
+class PasswordResetViewSet(BasePasswordResetViewSet):
+    throttle_classes = [PasswordResetThrottle]
+    serializer_class = PasswordResetSerializer
+
+
+class PasswordResetConfirmViewSet(BasePasswordResetViewSet):
+    throttle_classes = [PasswordResetThrottle]
+    serializer_class = PasswordResetConfirmSerializer
diff --git a/vstutils/api/permissions.py b/vstutils/api/permissions.py
index c638db3a..33ae15a1 100644
--- a/vstutils/api/permissions.py
+++ b/vstutils/api/permissions.py
@@ -13,6 +13,11 @@ def is_openapi_request(request):
     )
 
 
+class IsOpenApiRequest(permissions.BasePermission):
+    def has_permission(self, request, view):
+        return is_openapi_request(request)
+
+
 class IsAuthenticatedOpenApiRequest(permissions.IsAuthenticated):
     def has_permission(self, request, view):
         return is_openapi_request(request) or super().has_permission(request, view)
diff --git a/vstutils/api/registration/__init__.py b/vstutils/api/registration/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/vstutils/api/registration/serializers.py b/vstutils/api/registration/serializers.py
new file mode 100644
index 00000000..4e05b834
--- /dev/null
+++ b/vstutils/api/registration/serializers.py
@@ -0,0 +1,137 @@
+from functools import partial
+import unicodedata
+
+from django.conf import settings
+from django.contrib.auth import get_user_model, password_validation
+from django.contrib.auth.hashers import check_password, make_password
+from django.core.cache import cache
+from django.db import transaction
+from django.test import override_settings
+from rest_framework import fields
+from rest_framework.exceptions import ValidationError
+from vstutils.api.fields import PasswordField
+from vstutils.api.serializers import VSTSerializer
+from vstutils.utils import SecurePickling, send_template_email, lazy_translate as __, translate as _
+
+User = get_user_model()
+secure_pickle = SecurePickling()
+
+override_setting_decorator = override_settings(PASSWORD_HASHERS=settings.REGISTRATION_HASHERS)
+hash_data = override_setting_decorator(make_password)
+check_data = override_setting_decorator(check_password)
+
+
+def unique_username_validator(value):
+    if value and User.objects.filter(username__iexact=value).exists():
+        raise ValidationError(__("User with this username already exists."))
+    return value
+
+
+class UsernameField(fields.CharField):
+    default_validators = [unique_username_validator]
+
+    def to_internal_value(self, data):
+        value = super().to_internal_value(data)
+
+        # From django.contrib.auth.forms.UsernameField
+        if self.max_length is not None and len(value) > self.max_length:
+            # Normalization can increase the string length (e.g.
+            # "ff" -> "ff", "½" -> "1⁄2") but cannot reduce it, so there is no
+            # point in normalizing invalid data. Moreover, Unicode
+            # normalization is very slow on Windows and can be a DoS attack
+            # vector.
+            return value  # nocv
+        return unicodedata.normalize("NFKC", value)
+
+
+class UserRegistrationWithEmailConfirmationMixin(VSTSerializer):
+    email_confirmation_required = fields.BooleanField(default=False, read_only=True)
+
+    def is_email_confirmation_required(self, validated_data: dict):
+        return settings.SEND_CONFIRMATION_EMAIL
+
+    def build_confirmation_url(self, code: str):
+        return self.context["request"].build_absolute_uri(
+            settings.DEFAULT_REGISTRATION_VIEW_CONFIRMATION_LINK.format(code=code)
+        )
+
+    def get_confirmation_email_context(self, code: str):
+        return {
+            "action_url": self.build_confirmation_url(code),
+            "application_name": settings.PROJECT_GUI_NAME,
+            "title": __("Confirm your account"),
+            "text": settings.EMAIL_CONFIRMATION_MESSAGE.format(
+                application_name=settings.PROJECT_GUI_NAME
+            ),
+        }
+
+    def send_confirmation_email(self, validated_data):
+        code = hash_data(validated_data["email"])
+        cache.set(code, secure_pickle.dumps(validated_data))
+        send_template_email(
+            subject=__("Registration Confirmation."),
+            template_name="registration/confirm_email.html",
+            email=validated_data["email"],
+            context_data=self.get_confirmation_email_context(code),
+        )
+
+    def create(self, validated_data):
+        if self.is_email_confirmation_required(validated_data):
+            self.send_confirmation_email(validated_data)
+            validated_data["email_confirmation_required"] = True
+            return validated_data
+        return super().create(validated_data)
+
+
+class UserRegistrationSerializer(UserRegistrationWithEmailConfirmationMixin):
+    username = UsernameField()
+    password = PasswordField(
+        validators=[password_validation.validate_password],
+        write_only=True,
+    )
+
+    class Meta:
+        model = User
+        fields = [
+            "email_confirmation_required",
+            "first_name",
+            "last_name",
+            "email",
+            "username",
+            "password",
+        ]
+
+    def validate_password(self, value: str):
+        return make_password(value)
+
+
+class ConfirmEmailSerializer(VSTSerializer):
+    code = fields.CharField(write_only=True)
+
+    class Meta:
+        model = User
+        fields = [
+            "code",
+        ]
+
+    def get_saved_user_data(self, code: str):
+        data = cache.get(code)
+        if not data:
+            raise ValidationError({'code': [_("Confirmation code is invalid or expired.")]})
+        data = secure_pickle.loads(data)
+        if not check_data(data["email"], code):
+            raise ValidationError({'code': [_("Invalid registration email send.")]})
+        return data
+
+    def remove_saved_user_data(self, code: str):
+        cache.delete(code)
+
+    def create(self, validated_data):
+        code = validated_data["code"]
+        user = super().create(
+            self.get_saved_user_data(code)
+        )
+        transaction.on_commit(
+            partial(self.remove_saved_user_data, code),
+        )
+        return user
diff --git a/vstutils/api/registration/views.py b/vstutils/api/registration/views.py
new file mode 100644
index 00000000..3d495916
--- /dev/null
+++ b/vstutils/api/registration/views.py
@@ -0,0 +1,26 @@
+from django.conf import settings
+from django.utils.module_loading import import_string
+from rest_framework.mixins import CreateModelMixin
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.throttling import AnonRateThrottle
+from vstutils.api.base import GenericViewSet
+
+from .serializers import ConfirmEmailSerializer
+
+
+class RegistrationThrottle(AnonRateThrottle):
+    scope = "registration"
+
+
+class UserRegistrationViewSet(GenericViewSet, CreateModelMixin):
+    throttle_classes = [RegistrationThrottle]
+    permission_classes = [~IsAuthenticated]
+    serializer_class = import_string(
+        settings.DEFAULT_REGISTRATION_VIEW_SERIALIZER_CLASS
+    )
+
+
+class ConfirmEmailViewSet(GenericViewSet, CreateModelMixin):
+    throttle_classes = [RegistrationThrottle]
+    permission_classes = [~IsAuthenticated]
+    serializer_class = ConfirmEmailSerializer
diff --git a/vstutils/api/routers.py b/vstutils/api/routers.py
index 70c15ea8..74124035 100644
--- a/vstutils/api/routers.py
+++ b/vstutils/api/routers.py
@@ -167,6 +167,12 @@ def generate(self, views_list):
                 'view': 'vstutils.api.auth.UserViewSet'
             }
 
+        if settings.OAUTH_SERVER_ENABLE and r'revoke' not in views_list:
+            views_list[r'_revoke'] = {
+                'view': 'vstutils.oauth2.endpoints.RevokeTokenViewSet',
+                'type': 'view',
+            }
+
         super().generate(views_list)
 
 
diff --git a/vstutils/api/schema/generators.py b/vstutils/api/schema/generators.py
index 47e99934..88e452df 100644
--- a/vstutils/api/schema/generators.py
+++ b/vstutils/api/schema/generators.py
@@ -1,8 +1,9 @@
 import os
 import time
 import copy
+from urllib.parse import urljoin
 
-import jwt
+from authlib.jose import jwt, OctKey
 from rest_framework import request as drf_request
 from django.conf import settings
 from django.utils.module_loading import import_string
@@ -22,6 +23,28 @@ def get_centrifugo_public_address(request: drf_request.Request):
     return os.path.join(address.replace('http', 'ws', 1), 'connection/websocket')
 
 
+def get_oauth2_security_definition(request: drf_request.Request):
+    if settings.OAUTH_SERVER_URL:
+        token_url = urljoin(
+            settings.OAUTH_SERVER_URL,
+            settings.OAUTH_SERVER_TOKEN_ENDPOINT_PATH or f'/{settings.API_URL}/oauth2/token/',
+        )
+    elif settings.OAUTH_SERVER_ENABLE:
+        token_url = request.build_absolute_uri(f'/{settings.API_URL}/oauth2/token/')
+
+    definition = {
+        'type': 'oauth2',
+        'flow': 'password',
+        'tokenUrl': token_url,
+        'scopes': {},
+    }
+
+    if settings.OAUTH_SERVER_SCHEMA_CLIENT_ID:
+        definition['x-clientId'] = settings.OAUTH_SERVER_SCHEMA_CLIENT_ID
+
+    return definition
+
+
 class EndpointEnumerator(generators.EndpointEnumerator):
     api_url_prifix = f'^{settings.API_URL}/'
 
@@ -127,22 +150,23 @@ def get_schema(self, request: drf_request.Request = None, *args, **kwargs):  # t
         if not getattr(request, 'version', ''):
             request.version = self.version
         result = super().get_schema(request, *args, **kwargs)
+        result['securityDefinitions']['oauth2'] = get_oauth2_security_definition(request)
         if request and getattr(request, 'accepted_media_type', None) == 'application/openapi+json':
             result['info']['x-user-id'] = request.user.pk
             if (notificator := getattr(request, 'notificator', None)) and request.user.is_authenticated:
                 secret = notificator.get_openapi_secret()
                 if secret and request.user.pk:
                     result['info']['x-centrifugo-token'] = jwt.encode(
-                        {
+                        header={'alg': 'HS256', 'typ': 'JWT'},
+                        payload={
                             "sub": request.session.session_key,
                             "exp": int(time.time() + request.session.get_expiry_age()),
                             "info": {
                                 'user_id': request.user.pk
                             }
                         },
-                        secret,
-                        algorithm="HS256"
-                    )
+                        key=OctKey.import_key(secret),
+                    ).decode()
                     result['info']['x-centrifugo-address'] = get_centrifugo_public_address(request)
 
         for hook in self._get_hooks():
diff --git a/vstutils/api/schema/info.py b/vstutils/api/schema/info.py
index 53ca21e7..56e0e6a3 100644
--- a/vstutils/api/schema/info.py
+++ b/vstutils/api/schema/info.py
@@ -3,7 +3,6 @@
 
 import django
 from django.conf import settings
-from django.urls import reverse_lazy
 from rest_framework import __version__ as drf_version
 from fastapi import __version__ as fastapi_version
 from drf_yasg import openapi, __version__ as drf_yasg_version  # type: ignore
@@ -45,8 +44,6 @@
             static_path=settings.STATIC_URL,
             enable_gravatar=settings.ENABLE_GRAVATAR,
             time_zone=settings.TIME_ZONE,
-            logout_url=reverse_lazy('logout'),
-            login_url=reverse_lazy('login'),
         ),
         'x-page-limit': settings.PAGE_LIMIT,
         'x-subscriptions-prefix': settings.SUBSCRIPTIONS_PREFIX
diff --git a/vstutils/api/schema/schema.py b/vstutils/api/schema/schema.py
index 6ecc3ca3..4b7f52df 100644
--- a/vstutils/api/schema/schema.py
+++ b/vstutils/api/schema/schema.py
@@ -20,7 +20,10 @@
 
 
 def _get_nested_view_and_subaction(view, default=None):
-    sub_action = getattr(view, view.action, None)
+    action = getattr(view, 'action', None)
+    if not action:
+        return None, None
+    sub_action = getattr(view, action, None)
     return getattr(sub_action, '_nested_view', default), sub_action
 
 
diff --git a/vstutils/asgi.py b/vstutils/asgi.py
index 63e6bb92..5f5d9bec 100644
--- a/vstutils/asgi.py
+++ b/vstutils/asgi.py
@@ -3,6 +3,7 @@
 import posixpath
 import functools
 import time
+from datetime import timedelta
 
 import django
 import aiofiles.os
@@ -19,6 +20,11 @@
 
 from .signals import before_mount_app
 
+
+SPA_STATIC_MAX_AGE = round(
+    timedelta(days=30).total_seconds()
+)
+
 if not apps.apps_ready:
     django.setup(set_prefix=False)  # nocv
 
@@ -26,6 +32,7 @@
 static_app.add_middleware(GZipMiddleware)
 
 application = FastAPI(openapi_url=None, docs_url=None, redoc_url=None)
+
 application.mount(settings.STATIC_URL, static_app)
 application.add_middleware(
     CORSMiddleware,
@@ -69,6 +76,12 @@ async def static(file_path: str, request: Request = None):
     return response
 
 
+if settings.OAUTH_SERVER_ENABLE:
+    from vstutils.oauth2.endpoints import oauth_authorization_server, openid_configuration
+    application.get('/.well-known/oauth-authorization-server')(oauth_authorization_server)
+    application.get('/.well-known/openid-configuration')(openid_configuration)
+
+
 @application.get('/.well-known/{file_path:path}')
 async def well_known(file_path: str, request: Request):
     return await static(f'.well-known/{file_path}', request)
@@ -89,6 +102,17 @@ async def add_server_timing_header(request: Request, call_next):
     response.headers['Server-Timing'] = f'total;dur={round((time.monotonic()-start_time)*1000, 2)}'
     return response
 
+if not settings.API_ONLY:
+    @application.route("/")
+    async def root(request: Request):
+        return await static('spa/index.html', request)
+
+    @application.get('/spa/{file_path:path}')
+    async def serve_spa(file_path: str, request: Request):
+        response = await static(f'spa/{file_path}', request)
+        if response.status_code == 200:
+            response.headers['Cache-Control'] = f'public, max-age {SPA_STATIC_MAX_AGE}'
+        return response
+
 
-if not any(m.path == '/' for m in application.routes):
-    application.mount("/", ASGIHandler())
+application.mount("/", ASGIHandler())
diff --git a/vstutils/exceptions.py b/vstutils/exceptions.py
index cb099648..6fc3ffb1 100644
--- a/vstutils/exceptions.py
+++ b/vstutils/exceptions.py
@@ -1,5 +1,5 @@
 # pylint: disable=unused-import
-from rest_framework import status, exceptions
+from rest_framework import status, response, exceptions
 
 
 class NotModifiedException(exceptions.APIException):
@@ -32,3 +32,8 @@ def __init__(self, tp, msg=None):
 
 class NotApplicable(VSTUtilsException):
     status = status.HTTP_404_NOT_FOUND
+
+
+class HttpResponseException(Exception):
+    def get_response(self) -> response.Response:
+        raise NotImplementedError()
diff --git a/vstutils/gui/context.py b/vstutils/gui/context.py
index 4a99dc7e..668801b2 100644
--- a/vstutils/gui/context.py
+++ b/vstutils/gui/context.py
@@ -3,11 +3,10 @@
 from django.urls import reverse
 from django.conf import settings
 from django.http.request import HttpRequest
-from django.utils.functional import lazy, SimpleLazyObject
+from django.utils.functional import lazy
 from django.utils.module_loading import import_string
 
 from ..utils import raise_context_decorator_with_default
-from ..static_files import SPA_STATIC_FILES_PROVIDERS
 
 
 manifest_object = import_string(settings.MANIFEST_CLASS)()
@@ -16,7 +15,6 @@
 vstutils_version = settings.VSTUTILS_VERSION
 gui_version = "_".join(map(str, [project_version, project_lib_version, vstutils_version]))
 static_path = getattr(settings, 'STATIC_URL', '/static/')
-static_list = lazy(SPA_STATIC_FILES_PROVIDERS.get_sorted_list, tuple)()
 debug_enabled = getattr(settings, 'DEBUG', False)
 ignore_errors_decorator = raise_context_decorator_with_default(default={})
 
@@ -25,23 +23,10 @@ def lazy_decorator(func):
     return lazy(ignore_errors_decorator(func), dict)
 
 
-def lazy_value(func):
-    return SimpleLazyObject(func)
-
-
-def static_file_set_version_to_name(files_list_object: dict):
-    new_object = files_list_object.copy()
-    version_source = new_object.get('source', 'gui') or 'gui'
-    new_object['version'] = globals().get(version_source + '_version', gui_version)
-    return new_object
-
-
 @lazy_decorator
 def settings_constants(request: HttpRequest) -> Dict:
     # pylint: disable=unused-argument
     return {
-        "login_url": reverse('login'),
-        "logout_url": reverse('logout'),
         "docs_url": settings.DOC_URL if getattr(settings, 'HAS_DOCS', False) else '',
         "has_docs": getattr(settings, 'HAS_DOCS', False),
         "timezone": getattr(settings, 'TIME_ZONE', 'UTC'),
@@ -55,12 +40,11 @@ def settings_constants(request: HttpRequest) -> Dict:
 def project_args(request: HttpRequest) -> Dict:
     host_url = request.build_absolute_uri('/')[:-1]
     ver_key = f'{getattr(settings, "VST_PROJECT", "vstutils")}_version'
-    request_gui_version = f'{gui_version}_{str(request.user.id or 0)}'
+    api_url = f'{host_url}{reverse("api-root")}'
     return {
         "host_url": host_url,
         "gui_version": gui_version,
         "gui_named_version": f'{settings.VST_PROJECT}_{gui_version}',
-        "gui_user_version": request_gui_version,
         "vstutils_version": settings.VSTUTILS_VERSION,
         "project_lib_version": project_lib_version,
         "project_version": project_version,
@@ -70,9 +54,8 @@ def project_args(request: HttpRequest) -> Dict:
         "openapi_url": reverse('endpoint'),
         "endpoint_path": reverse('endpoint'),
         "api_version": settings.VST_API_VERSION,
-        "api_url": f'{host_url}{reverse("api-root")}{settings.VST_API_VERSION}/',
+        "api_url": f'{api_url}/{settings.VST_API_VERSION}',
         "enable_gravatar": settings.ENABLE_GRAVATAR,
-        "registration_enabled": settings.REGISTRATION_ENABLED,
     }
 
 
@@ -80,12 +63,6 @@ def project_args(request: HttpRequest) -> Dict:
 def pwa_context(request: HttpRequest) -> Dict:
     return {
         "manifest_object": manifest_object,
-        "static_files_list": lazy_value(
-            lambda: tuple(map(
-                static_file_set_version_to_name,
-                static_list
-            ))
-        ),
         "block_timeout": 86400 if not debug_enabled else 0,
     }
 
diff --git a/vstutils/gui/forms.py b/vstutils/gui/forms.py
deleted file mode 100644
index 600372ec..00000000
--- a/vstutils/gui/forms.py
+++ /dev/null
@@ -1,206 +0,0 @@
-from django.contrib.auth import get_user_model, logout
-from django.contrib.auth.forms import UserCreationForm
-from django.conf import settings
-from django import forms
-from django.forms.utils import ErrorDict
-from django.test import override_settings
-from django.urls import reverse
-from django.http import request as drequest
-from django.core.cache import cache
-from django.core.exceptions import SuspiciousOperation
-from django.contrib.auth.hashers import make_password, check_password
-from django.utils.html import strip_tags
-from django.utils.safestring import mark_safe
-
-
-from ..utils import SecurePickling, send_template_email, translate as _, lazy_translate as __
-
-UserModel = get_user_model()
-secure_pickle = SecurePickling()
-
-override_setting_decorator = override_settings(PASSWORD_HASHERS=settings.REGISTRATION_HASHERS)
-hash_data = override_setting_decorator(make_password)
-check_data = override_setting_decorator(check_password)
-
-
-class EmptyWidget(forms.widgets.HiddenInput):
-    def render(self, *args, **kwargs):
-        return ''
-
-
-class AgreementWidget(forms.widgets.CheckboxInput):
-    template_name = 'widgets/agreement_widget.html'
-
-    def __init__(self, *args, **kwargs):
-        kwargs['attrs'] = attrs = kwargs.get('attrs', {}) or {}
-        attrs['class'] = 'form-check-input'
-        super().__init__(*args, **kwargs)
-
-
-class AgreementField(forms.BooleanField):
-    widget = AgreementWidget
-
-    def __init__(self,
-                 before_link_text: str = '',
-                 after_link_text: str = '',
-                 url: str = None,
-                 *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.url_name = url
-        self.before_link_text = before_link_text
-        self.after_link_text = after_link_text
-
-    def get_bootstrap_label(self, field):
-        return mark_safe(  # nosec
-            f'{_(self.before_link_text)}'
-            f'<a href="#" onclick=open{field.name}Modal("{reverse(self.url_name)}")>'
-            f'{_(self.label)}'
-            f'</a>{_(self.after_link_text)}'
-        )
-
-
-class RegistrationForm(UserCreationForm):
-    request: drequest.HttpRequest
-
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-
-        if settings.ENABLE_AGREEMENT_TERMS:
-            self.fields['agreement'] = AgreementField(
-                before_link_text='I accept the ',
-                label='terms of agreement',
-                url='terms',
-                error_messages={'required': __('To continue, need to accept the terms agreement.')},
-            )
-        if settings.ENABLE_CONSENT_TO_PROCESSING:
-            self.fields['consent_to_processing'] = AgreementField(
-                before_link_text='I agree with ',
-                label='the personal data processing policy',
-                url='terms',
-                error_messages={'required': __('To continue, need to agree to the personal data processing policy.')},
-            )
-
-        for field in self.fields.values():
-            if field.help_text:
-                field.widget.attrs['title'] = strip_tags(field.help_text)
-
-    error_messages = {
-        'password_mismatch': __("The two password fields didn't match."),
-    }
-
-    first_name = forms.CharField(label=__('First name'), max_length=30, required=False, help_text='Optional.')
-    last_name = forms.CharField(label=__('Last name'), max_length=30, required=False, help_text='Optional.')
-    email = forms.EmailField(
-        label=__('Email'),
-        max_length=254,
-        help_text=__('Required. Inform a valid email address.')
-    )
-    if settings.SEND_CONFIRMATION_EMAIL:
-        uid = forms.CharField(max_length=256, required=False, widget=EmptyWidget(), label='')
-        email.help_text = __('A confirmation will be sent to your e-mail')
-
-    class Meta(UserCreationForm.Meta):
-        model = UserModel
-        fields = [
-            'username',
-            'first_name',
-            'last_name',
-            'email',
-            'password1',
-            'password2',
-        ]
-
-    def build_confirmation_url(self, uid):
-        # pylint: disable=no-member
-        return self.request.build_absolute_uri(f'{reverse("user_registration")}?uid={uid}')
-
-    def get_email_context(self):
-        return {}
-
-    def get_confirmation_email_context(self, key: str):
-        context = self.get_email_context()
-
-        context['action_url'] = self.build_confirmation_url(key)
-
-        if context.get('application_name', None) is None:
-            context['application_name'] = settings.PROJECT_GUI_NAME
-
-        context['title'] = _('Confirm your account')
-        context['text'] = _(settings.EMAIL_CONFIRMATION_MESSAGE).format(application_name=context['application_name'])
-
-        return context
-
-    def register_with_confirmation(self, commit):
-        cache_key = self.cleaned_data.get('uid', None)
-
-        if cache_key in (None, ''):
-            cache_key = hash_data(self.cleaned_data['email'])
-            self.cleaned_data['uid'] = cache_key
-
-            secured_data = secure_pickle.dumps(self.cleaned_data)
-            cache.set(cache_key, secured_data)
-
-            send_template_email(
-                subject=_('Registration Confirmation.'),
-                template_name='registration/confirm_email.html',
-                email=self.cleaned_data['email'],
-                context_data=self.get_confirmation_email_context(cache_key),
-            )
-            return super().save(commit=False)
-
-        if not check_data(self.cleaned_data['email'], cache_key):
-            raise SuspiciousOperation(
-                _('Invalid registration email send.')
-            )
-        return super().save(commit)
-
-    def save(self, commit=True):
-        if settings.SEND_CONFIRMATION_EMAIL:
-            return self.register_with_confirmation(commit)
-        return super(RegistrationForm, self).save(commit)
-
-    def _clean_fields(self):
-        super()._clean_fields()
-        if settings.SEND_CONFIRMATION_EMAIL:
-            uid = self.cleaned_data.get('uid', None)
-            if self.errors and uid not in (None, ''):
-                try:
-                    self.cleaned_data.update(secure_pickle.loads(cache.get(uid)))
-                    cache.delete(uid)
-                    self._errors = ErrorDict()
-                except TypeError:  # nocv
-                    self._errors = ErrorDict()
-                    self.add_error('uid', _('Confirmation link is invalid or expired'))
-
-    def _post_clean(self):
-        super()._post_clean()
-        if settings.SEND_CONFIRMATION_EMAIL and 'uid' in self._errors:
-            for err in tuple(self._errors.keys()):
-                if err != 'uid':
-                    del self._errors[err]
-
-
-class TwoFaForm(forms.Form):
-    pin = forms.CharField(required=True)
-
-    def __init__(self, *args, **kwargs):
-        self.request = kwargs.pop('request', None)
-        super(TwoFaForm, self).__init__(*args, **kwargs)
-
-    def clean(self):
-        pin = self.cleaned_data.get('pin')
-
-        if self.request.user.twofa.verify(pin):
-            self.request.session['2fa'] = True
-        else:
-            self.add_error('pin', 'Invalid authentication code')
-            attempts = self.request.session.get('2fa_attempts', 0) + 1
-            if attempts >= settings.MAX_TFA_ATTEMPTS:
-                logout(self.request)
-            else:
-                self.request.session['2fa_attempts'] = attempts
-
-        return super().clean()
-
-    def get_user(self):
-        return self.request.user
diff --git a/vstutils/gui/views.py b/vstutils/gui/views.py
index 3a47363c..36909c38 100644
--- a/vstutils/gui/views.py
+++ b/vstutils/gui/views.py
@@ -5,16 +5,13 @@
 from markdown import markdown
 from django.http.response import Http404
 from django.contrib.auth.decorators import login_required
-from django.views.generic.edit import FormView
 from django.views.generic import TemplateView
 from django.template.response import TemplateResponse
-from django.contrib.auth import views as auth, login
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.urls import reverse_lazy
 from jsmin import jsmin
 
-from .forms import RegistrationForm, TwoFaForm
 from ..utils import lazy_translate as __
 
 
@@ -38,7 +35,6 @@ def as_view(cls, *args, **kwargs):
 
 
 class GUIView(BaseView):
-    login_required = True
     template_name = "gui/gui.html"
 
 
@@ -69,64 +65,6 @@ class SWView(BaseView):
     response_class = JSMinTemplateResponse
 
 
-class Login(auth.LoginView):
-    template_name = 'auth/login.html'
-    redirect_authenticated_user = True
-
-    def _is_need_tfa(self, request):
-        return request.user.is_authenticated and getattr(request.user, 'need_twofa', False)
-
-    def dispatch(self, request, *args, **kwargs):
-        if self._is_need_tfa(request):
-            self.redirect_authenticated_user = False
-        return super(Login, self).dispatch(request, *args, **kwargs)
-
-    def get_form_class(self):
-        if self._is_need_tfa(self.request):
-            return TwoFaForm
-        return super().get_form_class()
-
-    def get_template_names(self):
-        if self._is_need_tfa(self.request):
-            return ['auth/tfa.html']
-        return super().get_template_names()
-
-    def get_context_data(self, **kwargs):
-        context = super(Login, self).get_context_data(**kwargs)
-        context['wait_confirmation'] = self.request.GET.get('confirmation', '') == 'true'
-        return context
-
-
-class Logout(auth.LogoutView):
-    next_page = reverse_lazy('login')
-
-
-class Registration(FormView, BaseView):
-    template_name = 'registration/user_registration.html'
-    success_url = reverse_lazy('login')
-    form_class = RegistrationForm
-
-    def form_valid(self, form):
-        form.request = self.request
-        user = form.save()
-        if settings.AUTHENTICATE_AFTER_REGISTRATION and user.id is not None:
-            login(self.request, user)
-        return super().form_valid(form)
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        if not settings.SEND_CONFIRMATION_EMAIL or 'uid' in context['form'].errors:
-            return context
-        context['uid'] = self.request.GET.get('uid', '')
-        return context
-
-    def get_success_url(self):
-        url = super().get_success_url()
-        if settings.SEND_CONFIRMATION_EMAIL and not self.request.POST.get('uid', False):
-            url += '?confirmation=true'
-        return url
-
-
 class BaseAgreementsView(TemplateView):
     template_name = 'registration/base_agreements.html'
     title_message = __('Terms')
diff --git a/vstutils/management/commands/web.py b/vstutils/management/commands/web.py
index 42513ee1..997e1a9c 100644
--- a/vstutils/management/commands/web.py
+++ b/vstutils/management/commands/web.py
@@ -73,6 +73,7 @@ class Command(BaseCommand):
     uwsgi_default_config = Path(os.path.dirname(__file__)).parent.parent / 'web.ini'
     default_addrport = settings.WEB_ADDRPORT
     prefix = getattr(settings, 'VST_PROJECT_LIB', 'vstutils').upper()
+    requires_system_checks = "__all__"
 
     def add_arguments(self, parser):
         super().add_arguments(parser)
diff --git a/vstutils/middleware.py b/vstutils/middleware.py
index 9ab6b9be..696a811f 100644
--- a/vstutils/middleware.py
+++ b/vstutils/middleware.py
@@ -7,8 +7,6 @@
 from django.apps import apps
 from django.conf import settings
 from django.utils import translation
-from django.urls import resolve
-from django.shortcuts import redirect
 
 from .api.models import Language
 from .utils import BaseVstObject
@@ -236,39 +234,6 @@ def get_response_handler(self, request):
         return response
 
 
-class TwoFaMiddleware(BaseMiddleware):
-    redirect_name = 'login'
-    pass_names = (
-        'login',
-        'logout',
-        'pwa_manifest',
-        'service_worker',
-        'offline_gui',
-        'user_registration',
-        'terms',
-    )
-
-    def request_handler(self, request):
-        request.user.need_twofa = False  # type: ignore
-        if request.user.is_authenticated:
-            twofa = getattr(request.user, 'twofa', None)
-            if twofa and not request.session.get('2fa', False):
-                request.user.need_twofa = True  # type: ignore
-        return request
-
-    def check_url_name(self, request):
-        url_name = resolve(request.path).url_name
-        return any([
-            url_name not in self.pass_names,
-            url_name is not None and url_name.startswith('password_reset')
-        ])
-
-    def get_response_handler(self, request):
-        if request.user.need_twofa and self.check_url_name(request):  # type: ignore
-            return redirect(self.redirect_name)
-        return super().get_response_handler(request)
-
-
 class FrontendChangesNotifications(BaseMiddleware):
     __slots__ = ('notificator',)
 
diff --git a/vstutils/middleware.pyi b/vstutils/middleware.pyi
index a8d45d14..e1bb5990 100644
--- a/vstutils/middleware.pyi
+++ b/vstutils/middleware.pyi
@@ -43,12 +43,6 @@ class LangMiddleware(BaseMiddleware):
     def get_lang_object(self, request: HttpRequest) -> _t.Tuple[Language, bool]: ...
     def get_response_handler(self, request: HttpRequest) -> ResponseHandlerType: ...
 
-class TwoFaMiddleware(BaseMiddleware):
-    redirect_name: _t.Text
-    pass_names: _t.Iterable[_t.Text]
-    def request_handler(self, request: HttpRequest) -> HttpRequest: ...
-    def check_url_name(self, request): ...
-    def get_response_handler(self, request: HttpRequest) -> ResponseHandlerType: ...
 
 class FrontendChangesNotifications(BaseMiddleware):
     notificator: Notificator
diff --git a/vstutils/oauth2/__init__.py b/vstutils/oauth2/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/vstutils/oauth2/authentication.py b/vstutils/oauth2/authentication.py
new file mode 100644
index 00000000..ab01a50d
--- /dev/null
+++ b/vstutils/oauth2/authentication.py
@@ -0,0 +1,60 @@
+from authlib.oauth2.base import OAuth2Error
+from authlib.oauth2.rfc6749 import MissingAuthorizationError, UnsupportedTokenTypeError
+from authlib.oauth2.rfc6750 import InvalidTokenError
+from django.contrib.auth import get_user
+from rest_framework.authentication import BaseAuthentication
+from rest_framework.exceptions import AuthenticationFailed
+from rest_framework.request import Request
+from rest_framework.response import Response
+from vstutils.exceptions import HttpResponseException
+from vstutils.utils import get_session_store, add_in_vary
+
+from .authorization_server import protector
+
+
+class OAuth2ErrorWrapper(HttpResponseException, AuthenticationFailed):
+    """
+    Base classes explanation:
+      * HttpResponseException - to be able to return http response that follows OAuth2 standard.
+      * AuthenticationFailed - to allow DRF make all actions necessary in case of failed
+      authentication (e.g. set request.user to None).
+    """
+
+    def __init__(self, error: "OAuth2Error"):
+        super().__init__()
+        self.error = error
+
+    def get_response(self):
+        status_code, body, headers = self.error()
+        return Response(
+            status=status_code,
+            headers=dict(headers),
+            data=body,
+        )
+
+
+def _get_request_token(request: "Request"):
+    try:
+        return protector.acquire_token(request)
+    except (MissingAuthorizationError, UnsupportedTokenTypeError):
+        pass
+    except InvalidTokenError as exc:
+        raise OAuth2ErrorWrapper(exc) from exc
+
+
+def get_session(session_key):
+    session = get_session_store()(session_key)
+    session._from_jwt = True  # pylint: disable=protected-access
+    return session
+
+
+class JWTBearerTokenAuthentication(BaseAuthentication):
+    def authenticate(self, request: "Request"):
+        if token := _get_request_token(request):
+            request._request.session = get_session(token['session_key'])  # pylint: disable=protected-access
+            self.patch_vary(request)
+            return get_user(request._request), token  # pylint: disable=protected-access
+
+    def patch_vary(self, request: "Request"):
+        if request.parser_context and (view := request.parser_context.get('view')):
+            add_in_vary(view.headers, 'authorization')
diff --git a/vstutils/oauth2/authorization_code.py b/vstutils/oauth2/authorization_code.py
new file mode 100644
index 00000000..2c79dce2
--- /dev/null
+++ b/vstutils/oauth2/authorization_code.py
@@ -0,0 +1,129 @@
+
+from dataclasses import dataclass, asdict
+from typing import Union
+import time
+
+from authlib.oidc.core import UserInfo
+from authlib.oauth2.rfc6749 import (
+    AuthorizationCodeGrant as BaseAuthorizationCodeGrant,
+    AuthorizationCodeMixin,
+)
+from authlib.oidc.core.grants import OpenIDCode as BaseOpenIDCode
+from django.conf import settings
+from django.contrib.auth import load_backend
+from django.core.cache import caches
+
+from .client import SimpleClient
+from .requests import DjangoOAuth2Request
+from .user import UserWrapper
+from .jwk import jwk_set
+
+
+_auth_code_cache = caches[settings.OAUTH_SERVER_AUTHORIZATION_CODE_CACHE_NAME]
+_auth_code_ttl = 300
+
+
+@dataclass
+class AuthorizationCode(AuthorizationCodeMixin):
+    code: str
+    client_id: str
+    redirect_uri: Union[str, None]
+    response_type: str
+    scope: str
+    user_id: str
+    auth_time: int
+    code_challenge: Union[str, None]
+    code_challenge_method: Union[str, None]
+    auth_backend_path: str
+
+    @classmethod
+    def query(cls, code: str, client_id: str) -> 'Union[AuthorizationCode, None]':
+        value = _auth_code_cache.get(cls._get_cache_key(code, client_id))
+        if value:
+            return cls(**value)
+        return None
+
+    @staticmethod
+    def _get_cache_key(code: str, client_id: str):
+        return f'auth-code:{code}-{client_id}'
+
+    def save(self):
+        _auth_code_cache.set(
+            self._get_cache_key(self.code, self.client_id),
+            asdict(self),
+            timeout=_auth_code_ttl,
+        )
+
+    def delete(self):
+        _auth_code_cache.delete(
+            self._get_cache_key(self.code, self.client_id),
+        )
+
+    def is_expired(self):
+        return self.auth_time + _auth_code_ttl < time.time()
+
+    def get_redirect_uri(self):
+        return self.redirect_uri
+
+    def get_scope(self):
+        return self.scope or ''
+
+    def get_auth_time(self):
+        return self.auth_time
+
+    def get_nonce(self):
+        return None
+
+
+class OpenIDCode(BaseOpenIDCode):  # pylint: disable=abstract-method
+    def get_jwt_config(self, grant):
+        key = jwk_set.find_by_kid('default')
+        return {
+            'key': key,
+            'alg': key['alg'],
+            'iss': settings.OAUTH_SERVER_ISSUER,
+            'exp': settings.OAUTH_SERVER_ID_TOKEN_EXPIRES_IN,
+        }
+
+    def generate_user_info(self, user: UserWrapper, scope):
+        return UserInfo(
+            sub=user.get_user_id(),
+            anon=user.is_anon(),
+        )
+
+
+class AuthorizationCodeGrant(BaseAuthorizationCodeGrant):
+    TOKEN_ENDPOINT_AUTH_METHODS = settings.OAUTH_SERVER_CLIENT_AUTHENTICATION_METHODS
+
+    def save_authorization_code(self, code: str, request: DjangoOAuth2Request):
+        if not getattr(request.user.django_user, 'backend', None):
+            raise ValueError('Property "backend" is missing on user instance')
+        client = request.client
+        auth_code = AuthorizationCode(
+            code=code,
+            client_id=client.get_client_id(),
+            redirect_uri=request.redirect_uri,
+            response_type=request.response_type,
+            scope=request.scope,
+            user_id=request.user.get_user_id(),
+            auth_time=int(time.time()),
+            code_challenge=request.data.get('code_challenge'),
+            code_challenge_method=request.data.get('code_challenge_method'),
+            auth_backend_path=request.user.django_user.backend,
+        )
+        auth_code.save()
+        return auth_code
+
+    def query_authorization_code(self, code, client: SimpleClient):
+        code = AuthorizationCode.query(code=code, client_id=client.get_client_id())
+        if code and not code.is_expired():
+            return code
+
+    def delete_authorization_code(self, authorization_code: AuthorizationCode):
+        authorization_code.delete()
+
+    def authenticate_user(self, authorization_code: AuthorizationCode):
+        backend = load_backend(authorization_code.auth_backend_path)
+        user = backend.get_user(authorization_code.user_id)
+        if user:
+            return UserWrapper(user)
diff --git a/vstutils/oauth2/authorization_server.py b/vstutils/oauth2/authorization_server.py
new file mode 100644
index 00000000..15370587
--- /dev/null
+++ b/vstutils/oauth2/authorization_server.py
@@ -0,0 +1,338 @@
+from functools import cached_property
+from time import time
+from typing import Callable, Optional, TYPE_CHECKING
+
+from authlib.integrations.django_oauth2 import (
+    AuthorizationServer as BaseAuthorizationServer,
+    ResourceProtector,
+)
+from authlib.jose import jwt
+from authlib.oauth2.rfc6749 import (
+    InvalidRequestError,
+    RefreshTokenGrant as BaseRefreshTokenGrant,
+    ResourceOwnerPasswordCredentialsGrant as BaseResourceOwnerPasswordCredentialsGrant,
+    TokenMixin,
+)
+from authlib.oauth2.rfc7009 import (
+    RevocationEndpoint as BaseRevocationEndpoint,
+)
+from authlib.oauth2.rfc7636 import CodeChallenge
+from authlib.oauth2.rfc7662 import (
+    IntrospectionEndpoint as BaseIntrospectionEndpoint,
+)
+from authlib.oauth2.rfc9068 import (
+    JWTBearerTokenGenerator as BaseJWTBearerTokenGenerator,
+    JWTBearerTokenValidator as BaseJWTBearerTokenValidator,
+)
+from authlib.oauth2.rfc9068.claims import JWTAccessTokenClaims, JWTClaims
+from django.conf import settings
+from django.contrib.auth import authenticate, login, get_user
+from django.contrib.auth.models import AnonymousUser, AbstractBaseUser
+from django.utils.module_loading import import_string
+from vstutils.utils import get_session_store
+
+from .authorization_code import AuthorizationCodeGrant, OpenIDCode
+from .client import query_simple_client, SameOriginSpaClient, SimpleClient
+from .jwk import jwk_set
+from .requests import DjangoOAuth2Request, DjangoOAuthJsonRequest
+from .user import UserWrapper
+
+if TYPE_CHECKING:  # nocv
+    from authlib.jose import KeySet
+
+
+extra_claims_provider: Optional[Callable[[AbstractBaseUser], Optional[dict]]] = (
+    import_string(settings.OAUTH_SERVER_JWT_EXTRA_CLAIMS_PROVIDER)
+    if settings.OAUTH_SERVER_JWT_EXTRA_CLAIMS_PROVIDER
+    else None
+)
+
+
+class MissingOrInvalidSecondFactorError(InvalidRequestError):
+    def __init__(self):
+        super().__init__(description='Missing or invalid \"second_factor\" in request.')
+
+    def get_body(self):
+        body = super().get_body()
+        body.append(('second_factor_missing_or_invalid', True))
+        return body
+
+
+def expires_generator(client, grant_type):
+    return settings.OAUTH_SERVER_TOKEN_EXPIRES_IN
+
+
+class JWTBearerTokenGenerator(BaseJWTBearerTokenGenerator):
+    def __init__(self, refresh_token_generator=None):
+        super().__init__(
+            issuer=settings.OAUTH_SERVER_ISSUER,
+            alg=settings.OAUTH_SERVER_JWT_ALG,
+            expires_generator=expires_generator,
+            refresh_token_generator=refresh_token_generator,
+        )
+
+    def get_jwks(self):
+        return jwk_set
+
+    def get_extra_claims(self, client: SimpleClient, grant_type, user: 'UserWrapper', scope):
+        claims = {}
+
+        client.request.ensure_session()
+        django_request = client.request._request  # pylint: disable=protected-access
+        if not user.is_anon():
+            login(django_request, user.django_user)
+            django_request.session.save()
+        claims['session_key'] = django_request.session.session_key
+
+        if user.is_anon():
+            claims['anon'] = True
+
+        if extra_claims_provider:
+            if (extra_claims := extra_claims_provider(user.django_user)):
+                claims.update(extra_claims)
+
+        return claims
+
+
+class JWTSessionRefreshTokenGenerator:
+    def __init__(self, issuer: str, alg: str, key: 'KeySet'):
+        self.issuer = issuer
+        self.alg = alg
+        self.key = key
+
+    def __call__(self, client: SimpleClient, grant_type, user: 'UserWrapper', scope):
+        token_data = {
+            'iss': self.issuer,
+            'client_id': client.get_client_id(),
+            'iat': int(time()),
+            'scope': scope,
+            'refresh': True,
+            'jti': client.request._request.session.session_key,
+        }
+
+        if user.is_anon():
+            token_data['anon'] = True
+
+        access_token = jwt.encode(
+            header={'alg': self.alg, 'typ': 'jwt'},
+            payload=token_data,
+            key=self.key,
+            check=False,
+        )
+        return access_token.decode()
+
+
+class JWTBearerTokenValidator(BaseJWTBearerTokenValidator):
+    def __init__(self):
+        super().__init__(
+            issuer=settings.OAUTH_SERVER_ISSUER,
+            resource_server=None,
+        )
+
+    def get_jwks(self):
+        return jwk_set
+
+
+class ResourceOwnerPasswordCredentialsGrant(BaseResourceOwnerPasswordCredentialsGrant):
+    TOKEN_ENDPOINT_AUTH_METHODS = settings.OAUTH_SERVER_CLIENT_AUTHENTICATION_METHODS
+
+    def authenticate_user(self, username, password):
+        if (
+            settings.OAUTH_SERVER_ENABLE_ANON_LOGIN and
+            username == '' and password == ''  # nosec
+        ):
+            return UserWrapper(AnonymousUser())
+        user = authenticate(
+            self.request._request,  # pylint: disable=protected-access
+            username=username,
+            password=password,
+        )
+        if not user:
+            return
+        user = UserWrapper(user)
+        if user.second_factor_required():
+            if not user.validate_second_factor(
+                self.request.data.get('second_factor')
+            ):
+                raise MissingOrInvalidSecondFactorError()
+        return user
+
+
+class SessionRefreshTokenGrant(BaseRefreshTokenGrant):
+    TOKEN_ENDPOINT_AUTH_METHODS = settings.OAUTH_SERVER_CLIENT_AUTHENTICATION_METHODS
+
+    def authenticate_refresh_token(self, refresh_token: str):
+        return JWTSessionRefreshToken.decode(refresh_token)
+
+    def authenticate_user(self, refresh_token: 'JWTSessionRefreshToken'):
+        return refresh_token.get_user()
+
+    def revoke_old_credential(self, refresh_token):
+        pass
+
+
+class JWTBearerToken(TokenMixin):  # pylint: disable=abstract-method
+    def __init__(self, claims: JWTAccessTokenClaims):
+        self.claims = claims
+
+    @classmethod
+    def decode(cls, token: str):
+        try:
+            claims = jwt.decode(token, key=jwk_set, claims_cls=JWTAccessTokenClaims)
+            claims.validate()
+            return cls(claims)
+        except:
+            return None
+
+    def is_expired(self):
+        return self.claims['exp'] < time()
+
+    def is_revoked(self):
+        return False
+
+
+class JWTSessionRefreshToken(TokenMixin):  # pylint: disable=abstract-method
+    class RequestMock:
+        def __init__(self, session):
+            self.session = session
+
+    claims_options = {
+        "iss": {
+            "essential": True,
+            "value": settings.OAUTH_SERVER_ISSUER,
+        },
+        "client_id": {
+            "essential": True,
+        },
+        "jti": {
+            "essential": True,
+        },
+        "refresh": {
+            "essential": True,
+            "value": True,
+        }
+    }
+
+    def __init__(self, claims: 'JWTClaims'):
+        self.claims = claims
+
+    @classmethod
+    def decode(cls, token: str):
+        try:
+            claims = jwt.decode(token, key=jwk_set, claims_options=cls.claims_options)
+            claims.validate()
+            return cls(claims)
+        except:
+            return None
+
+    @cached_property
+    def _session(self):
+        session = get_session_store()(self.claims['jti'])
+        if session.exists(session.session_key):
+            return session
+
+    def get_user(self):
+        if not self._session:
+            return
+        if self.claims.get('anon'):
+            return UserWrapper(AnonymousUser())
+        user = get_user(self.RequestMock(self._session))
+        if user:
+            return UserWrapper(user)
+
+    def revoke(self):
+        self._session.delete()
+
+    def check_client(self, client: 'SimpleClient'):
+        return client.get_client_id() == self.claims['client_id']
+
+    def get_scope(self):
+        return self.claims.get('scope')
+
+
+class SessionRefreshTokenRevocationEndpoint(BaseRevocationEndpoint):
+    CLIENT_AUTH_METHODS = settings.OAUTH_SERVER_CLIENT_AUTHENTICATION_METHODS
+
+    def query_token(self, token_string, token_type_hint):
+        return JWTSessionRefreshToken.decode(token_string)
+
+    def revoke_token(self, token: 'JWTSessionRefreshToken', request):
+        token.revoke()
+
+
+class IntrospectionEndpoint(BaseIntrospectionEndpoint):
+    CLIENT_AUTH_METHODS = settings.OAUTH_SERVER_CLIENT_AUTHENTICATION_METHODS
+
+    def query_token(self, token_string, token_type_hint):
+        return JWTBearerToken.decode(token_string)
+
+    def check_permission(self, token, client, request):
+        return True
+
+    def introspect_token(self, token: JWTBearerToken):
+        return {
+            'sub': token.claims['sub'],
+        }
+
+
+def same_origin_auth_method(query_client, request):
+    if request.headers.get('Sec-Fetch-Site') == 'same-origin':
+        return SameOriginSpaClient()
+
+
+class AuthorizationServer(BaseAuthorizationServer):
+    def __init__(self):
+        super().__init__(client_model=None, token_model=None)
+
+        self.register_grant(
+            ResourceOwnerPasswordCredentialsGrant,
+            extensions=[
+                OpenIDCode(),
+                *map(
+                    import_string,
+                    settings.OAUTH_SERVER_PASSWORD_GRANT_ADDITIONAL_EXTENSIONS,
+                ),
+            ],
+        )
+        self.register_grant(
+            SessionRefreshTokenGrant,
+        )
+        self.register_grant(
+            AuthorizationCodeGrant,
+            extensions=[
+                OpenIDCode(),
+                CodeChallenge(required=True),
+                *map(
+                    import_string,
+                    settings.OAUTH_SERVER_AUTHORIZATION_CODE_GRANT_ADDITIONAL_EXTENSIONS,
+                ),
+            ],
+        )
+        self.register_token_generator(
+            'default',
+            JWTBearerTokenGenerator(
+                refresh_token_generator=JWTSessionRefreshTokenGenerator(
+                    issuer=settings.OAUTH_SERVER_ISSUER,
+                    alg=settings.OAUTH_SERVER_JWT_ALG,
+                    key=jwk_set,
+                ),
+            ),
+        )
+        self.register_endpoint(SessionRefreshTokenRevocationEndpoint)
+        self.register_endpoint(IntrospectionEndpoint)
+        self.register_client_auth_method('same_origin', same_origin_auth_method)
+
+    def create_oauth2_request(self, request):
+        if request.content_type == 'application/json':
+            return DjangoOAuthJsonRequest(request)
+        return DjangoOAuth2Request(request)
+
+    def query_client(self, client_id):
+        return query_simple_client(client_id)
+
+    def save_token(self, token, request):
+        """JWT token should not be saved"""
+
+
+protector = ResourceProtector()
+protector.register_token_validator(JWTBearerTokenValidator())
diff --git a/vstutils/oauth2/client.py b/vstutils/oauth2/client.py
new file mode 100644
index 00000000..46ab0814
--- /dev/null
+++ b/vstutils/oauth2/client.py
@@ -0,0 +1,74 @@
+from typing import Optional, TYPE_CHECKING
+
+from django.conf import settings
+from authlib.oauth2.rfc6749 import ClientMixin
+
+if TYPE_CHECKING:  # nocv
+    from .requests import DjangoOAuth2Request
+
+
+class SimpleClient(ClientMixin):
+    request: 'Optional[DjangoOAuth2Request]'
+
+    def __init__(  # noqa: CFQ002 pylint: disable=too-many-arguments
+        self,
+        *,
+        id: str,
+        allowed_grant_types: list[str],
+        secret: Optional[str] = None,
+        allowed_redirect_uris: Optional[list[str]] = None,
+        allowed_response_types: Optional[list[str]] = None,
+        token_endpoint_auth_methods: Optional[list[str]] = None,
+        default_redirect_uri: Optional[str] = None,
+    ):
+        self.id = id
+        self.allowed_grant_types = allowed_grant_types
+        self.secret = secret
+        self.allowed_redirect_uris = allowed_redirect_uris or []
+        self.allowed_response_types = allowed_response_types or []
+        self.token_endpoint_auth_methods = token_endpoint_auth_methods or []
+        self.default_redirect_uri = default_redirect_uri
+        self.request = None
+
+    def get_client_id(self):
+        return self.id
+
+    def check_client_secret(self, client_secret):
+        return self.secret == client_secret
+
+    def check_endpoint_auth_method(self, method, endpoint):
+        if endpoint == 'token':
+            return method in self.token_endpoint_auth_methods
+        return True
+
+    def check_grant_type(self, grant_type):
+        return grant_type in self.allowed_grant_types
+
+    def get_allowed_scope(self, scope):
+        return scope
+
+    def check_redirect_uri(self, redirect_uri: str):
+        return redirect_uri in self.allowed_redirect_uris
+
+    def check_response_type(self, response_type: str):
+        return response_type in self.allowed_response_types
+
+    def get_default_redirect_uri(self):
+        return self.default_redirect_uri
+
+
+class SameOriginSpaClient(SimpleClient):
+    def __init__(self):
+        super().__init__(
+            id='spa',
+            allowed_grant_types=['password', 'refresh_token'],
+            token_endpoint_auth_methods=['same_origin'],
+        )
+
+
+def query_simple_client(client_id: str):
+    if client_id in settings.OAUTH_SERVER_CLIENTS:
+        return SimpleClient(
+            id=client_id,
+            **settings.OAUTH_SERVER_CLIENTS[client_id],
+        )
diff --git a/vstutils/oauth2/endpoints.py b/vstutils/oauth2/endpoints.py
new file mode 100644
index 00000000..7b131b1c
--- /dev/null
+++ b/vstutils/oauth2/endpoints.py
@@ -0,0 +1,229 @@
+from typing import TYPE_CHECKING
+from urllib.parse import urljoin, urlunsplit
+
+from django.conf import settings
+from django.utils.module_loading import import_string
+from drf_yasg import openapi
+from drf_yasg.utils import swagger_auto_schema
+from fastapi import Request
+from rest_framework.parsers import FormParser, JSONParser
+from rest_framework.permissions import IsAuthenticated, BasePermission
+from rest_framework.throttling import AnonRateThrottle
+from rest_framework.views import APIView
+from vstutils.api.permissions import IsOpenApiRequest
+from vstutils.api.responses import HTTP_200_OK
+
+from .authentication import JWTBearerTokenAuthentication
+
+if TYPE_CHECKING:
+    from authlib.oauth2.rfc6749 import AuthorizationServer  # nocv
+
+ServerClass = import_string(settings.OAUTH_SERVER_CLASS)
+server: "AuthorizationServer" = ServerClass()
+
+
+class Oauth2Throttle(AnonRateThrottle):
+    scope = "oauth2"
+
+
+class TokenViewSet(APIView):
+    parser_classes = [JSONParser, FormParser]
+    throttle_classes = [Oauth2Throttle]
+    authentication_classes = []
+    permission_classes = []
+
+    @swagger_auto_schema(
+        operation_id="get_token",
+        request_body=openapi.Schema(
+            type=openapi.TYPE_OBJECT,
+            properties={
+                "grant_type": openapi.Schema(
+                    type=openapi.TYPE_STRING, enum=["password"]
+                ),
+                "client_id": openapi.Schema(type=openapi.TYPE_STRING),
+                "client_secret": openapi.Schema(type=openapi.TYPE_STRING),
+                "username": openapi.Schema(type=openapi.TYPE_STRING),
+                "password": openapi.Schema(type=openapi.TYPE_STRING),
+                "second_factor": openapi.Schema(type=openapi.TYPE_STRING),
+            },
+            required=[
+                "grant_type",
+                "username",
+                "password",
+            ],
+        ),
+        responses={
+            200: "Token response",
+            400: openapi.Response(
+                description="Bad request",
+                schema=openapi.Schema(
+                    type=openapi.TYPE_OBJECT,
+                    properties={
+                        "error": openapi.Schema(type=openapi.TYPE_STRING),
+                        "error_description": openapi.Schema(type=openapi.TYPE_STRING),
+                        "second_factor_missing_or_invalid": openapi.Schema(
+                            type=openapi.TYPE_BOOLEAN
+                        ),
+                    },
+                    additional_properties=True,
+                    required=["error"],
+                ),
+            ),
+        },
+    )
+    def post(self, request):
+        return server.create_token_response(request)
+
+
+class RevokeTokenViewSet(APIView):
+    parser_classes = [JSONParser, FormParser]
+    throttle_classes = [Oauth2Throttle]
+    authentication_classes = []
+    permission_classes = []
+
+    @swagger_auto_schema(
+        operation_id="revoke_token",
+        request_body=openapi.Schema(
+            type=openapi.TYPE_OBJECT,
+            properties={
+                "token": openapi.Schema(type=openapi.TYPE_STRING),
+                "token_type_hint": openapi.Schema(type=openapi.TYPE_STRING),
+            },
+            required=["token"],
+        ),
+        responses={
+            200: "Token revoked",
+        },
+    )
+    def post(self, request):
+        return server.create_endpoint_response("revocation", request)
+
+
+class TokenIntrospectionViewSet(APIView):
+    parser_classes = [JSONParser, FormParser]
+    throttle_classes = [Oauth2Throttle]
+    authentication_classes = []
+    permission_classes = []
+
+    @swagger_auto_schema(
+        operation_id="token_introspection",
+        request_body=openapi.Schema(
+            type=openapi.TYPE_OBJECT,
+            properties={
+                "token": openapi.Schema(type=openapi.TYPE_STRING),
+                "token_type_hint": openapi.Schema(type=openapi.TYPE_STRING),
+            },
+            required=["token"],
+        ),
+        responses={
+            200: openapi.Response(
+                description="Token introspection",
+                schema=openapi.Schema(
+                    type=openapi.TYPE_OBJECT,
+                    properties={
+                        "active": openapi.Schema(type=openapi.TYPE_BOOLEAN),
+                        "scope": openapi.Schema(type=openapi.TYPE_STRING),
+                        "client_id": openapi.Schema(type=openapi.TYPE_STRING),
+                        "username": openapi.Schema(type=openapi.TYPE_STRING),
+                        "token_type": openapi.Schema(type=openapi.TYPE_STRING),
+                        "exp": openapi.Schema(type=openapi.TYPE_INTEGER),
+                        "iat": openapi.Schema(type=openapi.TYPE_INTEGER),
+                        "nbf": openapi.Schema(type=openapi.TYPE_INTEGER),
+                        "sub": openapi.Schema(type=openapi.TYPE_STRING),
+                        "aud": openapi.Schema(type=openapi.TYPE_STRING),
+                        "iss": openapi.Schema(type=openapi.TYPE_STRING),
+                        "jti": openapi.Schema(type=openapi.TYPE_STRING),
+                    },
+                    required=["active"],
+                ),
+            ),
+        },
+    )
+    def post(self, request):
+        return server.create_endpoint_response("introspection", request)
+
+
+class IsAnonAllowed(BasePermission):
+    def has_permission(self, request, view):
+        return settings.OAUTH_SERVER_ENABLE_ANON_LOGIN
+
+
+class IsAnyUser(BasePermission):
+    def has_permission(self, request, view):
+        return bool(request.user)
+
+
+class UserInfoView(APIView):
+    throttle_classes = [Oauth2Throttle]
+    authentication_classes = []
+    permission_classes = [IsOpenApiRequest | (IsAnonAllowed & IsAnyUser) | IsAuthenticated]
+    authentication_classes = [JWTBearerTokenAuthentication]
+    parser_classes = [JSONParser, FormParser]
+
+    @swagger_auto_schema(
+        operation_id="userinfo",
+        responses={
+            200: openapi.Response(
+                description="User info",
+                schema=openapi.Schema(
+                    type=openapi.TYPE_OBJECT,
+                    properties={
+                        "sub": openapi.Schema(type=openapi.TYPE_STRING),
+                        "name": openapi.Schema(type=openapi.TYPE_STRING),
+                        "given_name": openapi.Schema(type=openapi.TYPE_STRING),
+                        "family_name": openapi.Schema(type=openapi.TYPE_STRING),
+                        "preferred_username": openapi.Schema(type=openapi.TYPE_STRING),
+                        "email": openapi.Schema(type=openapi.TYPE_STRING),
+                        "anon": openapi.Schema(type=openapi.TYPE_BOOLEAN),
+                    },
+                    required=["sub"],
+                ),
+            ),
+        },
+    )
+    def get(self, request):
+        user = request.user
+        token = request.auth
+
+        if user.is_anonymous:
+            return HTTP_200_OK(
+                {
+                    "sub": token['sub'],
+                    "anon": True,
+                }
+            )
+
+        return HTTP_200_OK(
+                {
+                    "sub": token['sub'],
+                    "name": user.get_full_name(),
+                    "given_name": user.first_name,
+                    "family_name": user.last_name,
+                    "preferred_username": user.get_username(),
+                    "email": user.email,
+                }
+            )
+
+
+def oauth_authorization_server(request: Request):
+    base_url = str(request.url)
+    conf = {
+        # Leave only origin, for example https://test:123
+        "issuer": urlunsplit([request.url.scheme, request.url.netloc, "", "", ""]),
+        "token_endpoint": urljoin(base_url, f"/{settings.API_URL}/oauth2/token/"),
+        "grant_types_supported": ["password", "authorization_code"],
+        "response_types_supported": ["token", "code"],
+        "revocation_endpoint": urljoin(base_url, f"/{settings.API_URL}/oauth2/revoke/"),
+        "introspection_endpoint": urljoin(base_url, f"/{settings.API_URL}/oauth2/introspect/"),
+    }
+    if settings.OAUTH_SERVER_AUTHORIZATION_ENDPOINT:
+        conf['authorization_endpoint'] = settings.OAUTH_SERVER_AUTHORIZATION_ENDPOINT
+    return conf
+
+
+def openid_configuration(request: Request):
+    base_url = str(request.url)
+    return {
+        **oauth_authorization_server(request),
+        "userinfo_endpoint": urljoin(base_url, f"/{settings.API_URL}/oauth2/userinfo/"),
+    }
diff --git a/vstutils/oauth2/jwk.py b/vstutils/oauth2/jwk.py
new file mode 100644
index 00000000..c7af2a89
--- /dev/null
+++ b/vstutils/oauth2/jwk.py
@@ -0,0 +1,14 @@
+from authlib.jose import JsonWebKey
+from django.conf import settings
+
+
+jwk_set = JsonWebKey.import_key_set({
+    "keys": [
+        {
+            "kid": "default",
+            "kty": "oct",
+            "k": settings.OAUTH_SERVER_JWT_KEY,
+            "alg": settings.OAUTH_SERVER_JWT_ALG,
+        }
+    ]
+})
diff --git a/vstutils/oauth2/requests.py b/vstutils/oauth2/requests.py
new file mode 100644
index 00000000..ab55d893
--- /dev/null
+++ b/vstutils/oauth2/requests.py
@@ -0,0 +1,41 @@
+from functools import cached_property
+from typing import TYPE_CHECKING, Optional
+
+from authlib.integrations.django_oauth2.requests import (
+    DjangoOAuth2Request as BaseDjangoOAuth2Request,
+)
+from vstutils.utils import get_session_store
+
+if TYPE_CHECKING:  # nocv
+    from .client import SimpleClient
+
+
+class DjangoOAuth2Request(BaseDjangoOAuth2Request):
+    @property
+    def client(self) -> 'Optional[SimpleClient]':
+        return getattr(self, '_client', None)
+
+    @client.setter
+    def client(self, client: 'Optional[SimpleClient]'):
+        if client:
+            client.request = self
+        self._client = client
+
+    def ensure_session(self):
+        if not getattr(self._request, 'session', None):
+            self._request.session = get_session_store()()
+        if not self._request.session.session_key:
+            self._request.session.save()
+
+
+class DjangoOAuthJsonRequest(DjangoOAuth2Request):
+    @property
+    def form(self):
+        return self._request.data
+
+    @cached_property
+    def data(self):  # pylint: disable=invalid-overridden-method
+        return {
+            **self._request.GET.dict(),
+            **self.form,
+        }
diff --git a/vstutils/oauth2/user.py b/vstutils/oauth2/user.py
new file mode 100644
index 00000000..b89484b1
--- /dev/null
+++ b/vstutils/oauth2/user.py
@@ -0,0 +1,32 @@
+from typing import Optional, Union, TYPE_CHECKING
+from uuid import uuid4
+
+from django.contrib.auth.models import AbstractBaseUser, AnonymousUser
+
+if TYPE_CHECKING:  # nocv
+    from .requests import DjangoOAuth2Request
+
+
+class UserWrapper:
+    request: 'Optional[DjangoOAuth2Request]' = None
+
+    def __init__(self, user: Union[AbstractBaseUser, AnonymousUser]):
+        self.django_user = user
+        self.pk: str = (
+            f'anon_{uuid4().hex}'
+            if user.is_anonymous
+            else user._meta.pk.value_to_string(user)
+        )
+
+    def is_anon(self) -> bool:
+        return self.django_user.is_anonymous
+
+    def get_user_id(self) -> str:
+        return self.pk
+
+    def second_factor_required(self):
+        twofa = getattr(self.django_user, 'twofa', None)
+        return twofa and twofa.enabled
+
+    def validate_second_factor(self, code):
+        return self.django_user.twofa.verify(code)
diff --git a/vstutils/settings.py b/vstutils/settings.py
index ee38fd1e..0fba4f4b 100644
--- a/vstutils/settings.py
+++ b/vstutils/settings.py
@@ -428,6 +428,30 @@ class WebPushSection(BackendSection):
     }
 
 
+class OAuthServerSection(cconfig.Section):
+    types_map = {
+        'server_url': ConfigStringType,
+        'server_token_endpoint_path': ConfigStringType,
+        'server_schema_client_id': ConfigStringType,
+
+        'server_enable': ConfigBoolType,
+        'server_issuer': ConfigStringType,
+        'server_allow_insecure': ConfigBoolType,
+        'server_enable_anon_login': ConfigBoolType,
+        'server_class': ConfigStringType,
+        'server_jwt_alg': ConfigStringType,
+        'server_jwt_key': ConfigStringType,
+        'server_jwt_extra_claims_provider': ConfigStringType,
+        'server_token_expires_in': ConfigIntSecondsType,
+        'server_id_token_expires_in': ConfigIntSecondsType,
+        'server_client_authentication_methods': ConfigListType,
+        'server_authorization_endpoint': ConfigStringType,
+        'server_enable_same_origin_client_auth': ConfigBoolType,
+        'server_simple_client_id': ConfigStringType,
+        'server_simple_client_secret': ConfigStringType,
+    }
+
+
 class DjangoEnv(environ.Env):
     BOOLEAN_TRUE_STRINGS = environ.Env.BOOLEAN_TRUE_STRINGS + ('enable', 'ENABLE')
 
@@ -577,7 +601,33 @@ class DjangoEnv(environ.Env):
         },
         'uvicorn': {
             'loop': 'auto',
-        }
+        },
+        'oauth': {
+            'server_url': '',
+            'server_token_endpoint_path': '',
+            'server_schema_client_id': '',
+
+            'server_enable': True,
+            'server_issuer': '',
+            'server_allow_insecure': False,
+            'server_class': 'vstutils.oauth2.authorization_server.AuthorizationServer',
+            'server_enable_anon_login': False,
+            'server_jwt_alg': 'HS256',
+            'server_jwt_key': None,
+            'server_jwt_extra_claims_provider': '',
+            'server_token_expires_in': 864000,
+            'server_id_token_expires_in': 3600,
+            'server_client_authentication_methods': [
+                'same_origin',
+                'client_secret_post',
+                'client_secret_basic',
+                'none',
+            ],
+            'server_authorization_endpoint': '',
+            'server_enable_same_origin_client_auth': True,
+            'server_simple_client_id': 'simple-client-id',
+            'server_simple_client_secret': 'simple-client-secret',
+        },
     },
     section_overload={
         'main': MainSection,
@@ -616,6 +666,7 @@ class DjangoEnv(environ.Env):
         'storages.boto3': Boto3Subsection,
         'uvicorn': UvicornSection,
         'webpush': WebPushSection,
+        'oauth': OAuthServerSection,
     },
     format_exclude_sections=('uwsgi',)
 )
@@ -657,6 +708,7 @@ def secret_key(secret_file, default='*sg17)9wa_e+4$n%7n7r_(kqwlsc^^xdoc3&px$hs)s
     web.get('secure_proxy_ssl_header_name', fallback='HTTP_X_FORWARDED_PROTOCOL'),
     web.get('secure_proxy_ssl_header_value', fallback='https')
 )
+ENABLE_ADMIN_PANEL = main['enable_admin_panel']
 
 # Include some addons if packages exists in env
 ##############################################################
@@ -672,7 +724,6 @@ def secret_key(secret_file, default='*sg17)9wa_e+4$n%7n7r_(kqwlsc^^xdoc3&px$hs)s
 # Applications definition
 ##############################################################
 INSTALLED_APPS: _t.List[_t.Text] = [
-    'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
@@ -698,6 +749,10 @@ def secret_key(secret_file, default='*sg17)9wa_e+4$n%7n7r_(kqwlsc^^xdoc3&px$hs)s
 
 INSTALLED_APPS += ADDONS
 
+if ENABLE_ADMIN_PANEL:
+    INSTALLED_APPS.append('django.contrib.admin')
+
+
 # Additional middleware and auth
 ##############################################################
 MIDDLEWARE: _t.List[_t.Text] = [
@@ -713,7 +768,6 @@ def secret_key(secret_file, default='*sg17)9wa_e+4$n%7n7r_(kqwlsc^^xdoc3&px$hs)s
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'vstutils.middleware.LangMiddleware',
-    'vstutils.middleware.TwoFaMiddleware',
 ]
 
 EXCLUDE_FROM_MINIFYING = []
@@ -731,7 +785,6 @@ def secret_key(secret_file, default='*sg17)9wa_e+4$n%7n7r_(kqwlsc^^xdoc3&px$hs)s
         'django.contrib.messages.middleware.MessageMiddleware',
         'django.middleware.clickjacking.XFrameOptionsMiddleware',
         'vstutils.middleware.LangMiddleware',
-        'vstutils.middleware.TwoFaMiddleware',
     ],
     'prepend': [
         'vstutils.api.endpoint.BulkMiddleware'
@@ -826,8 +879,6 @@ def get_plugins():
         },
     },
 ]
-LOGIN_URL: _t.Text = '/login/'
-LOGOUT_URL: _t.Text = '/logout/'
 LOGIN_REDIRECT_URL: _t.Text = '/'
 
 PASSWORD_RESET_TIMEOUT_DAYS: int = web['password_reset_timeout_days']
@@ -1063,13 +1114,12 @@ def parse_db(params):
     ],
     'DEEP_LINKING': True,
     'SECURITY_DEFINITIONS': {},
-    'LOGIN_URL': 'login',
-    'LOGOUT_URL': 'logout',
 }
 
 
 API: SIMPLE_OBJECT_SETTINGS_TYPE = {
-    VST_API_VERSION: {}
+    VST_API_VERSION: {},
+    'oauth2': {},
 }
 
 HEALTH_BACKEND_CLASS: _t.Text = 'vstutils.api.health.DefaultBackend'
@@ -1082,6 +1132,7 @@ def parse_db(params):
 PAGE_LIMIT: int = web["page_limit"]
 REST_FRAMEWORK: _t.Dict = {
     'DEFAULT_AUTHENTICATION_CLASSES': (
+        'vstutils.oauth2.authentication.JWTBearerTokenAuthentication',
         'rest_framework.authentication.SessionAuthentication',
     ),
     'DEFAULT_RENDERER_CLASSES': (
@@ -1131,7 +1182,12 @@ def parse_db(params):
     },
     'DEFAULT_THROTTLE_CLASSES': (
         'vstutils.api.throttling.ActionBasedThrottle',
-    )
+    ),
+    'DEFAULT_THROTTLE_RATES': {
+        'oauth2': '50/hour',
+        'registration': '50/hour',
+        'password_reset': '50/hour',
+    },
 }
 
 OPTIMIZE_GET_BY_VALUES = True
@@ -1263,7 +1319,6 @@ def parse_db(params):
 
 # View settings
 ##############################################################
-ENABLE_ADMIN_PANEL = main['enable_admin_panel']
 MANIFEST_CLASS = 'vstutils.gui.pwa_manifest.PWAManifest'
 
 VIEWS: SIMPLE_OBJECT_SETTINGS_TYPE = {
@@ -1291,52 +1346,6 @@ def parse_db(params):
             'name': 'offline_gui'
         }
     },
-    "LOGIN": {
-        "BACKEND": 'vstutils.gui.views.Login',
-        "OPTIONS": {
-            'name': 'login'
-        }
-    },
-    "LOGOUT": {
-        "BACKEND": 'vstutils.gui.views.Logout',
-        "OPTIONS": {
-            'view_args': [{'next_page': '/'}],
-            'name': 'logout'
-        }
-    },
-    "PASSWORD_RESET": {
-        "BACKEND": 'django.contrib.auth.views.PasswordResetView',
-        "OPTIONS": {
-            'name': 'password_reset',
-            'view_kwargs': {
-                'from_email': EMAIL_FROM_ADDRESS
-            }
-        }
-    },
-    "PASSWORD_RESET_CONFIRM": {
-        "BACKEND": 'django.contrib.auth.views.PasswordResetConfirmView',
-        "OPTIONS": {
-            'name': 'password_reset_confirm'
-        }
-    },
-    "PASSWORD_RESET_DONE": {
-        "BACKEND": 'django.contrib.auth.views.PasswordResetDoneView',
-        "OPTIONS": {
-            'name': 'password_reset_done'
-        }
-    },
-    "PASSWORD_RESET_COMPLETE": {
-        "BACKEND": 'django.contrib.auth.views.PasswordResetCompleteView',
-        "OPTIONS": {
-            'name': 'password_reset_complete'
-        }
-    },
-    "USER_REGISTRATION": {
-        "BACKEND": 'vstutils.gui.views.Registration',
-        "OPTIONS": {
-            'name': 'user_registration'
-        }
-    },
     "TERMS": {
         "BACKEND": 'vstutils.gui.views.TermsView',
         "OPTIONS": {
@@ -1358,27 +1367,13 @@ def parse_db(params):
     'offline.html': 'OFFLINE',
 }
 
-ACCOUNT_VIEWS: _t.Dict[_t.Text, _t.Union[_t.Text, _t.Dict]] = {
-    'LOGIN_URL': 'LOGIN',
-    'LOGOUT_URL': 'LOGOUT',
-    'password_reset/': 'PASSWORD_RESET',
-    'password_reset_done/': 'PASSWORD_RESET_DONE',
-    'password_reset_complete/': 'PASSWORD_RESET_COMPLETE',
-    'password_reset_confirm/<uidb64>/<token>/': 'PASSWORD_RESET_CONFIRM',
-}
-
-
 def get_accounts_views_mapping():
-    mapping = {**ACCOUNT_VIEWS}
-    if REGISTRATION_URL not in mapping and REGISTRATION_URL not in ACCOUNT_VIEWS and REGISTRATION_ENABLED:
-        mapping[REGISTRATION_URL] = 'USER_REGISTRATION'
+    mapping = {}
+    if ENABLE_AGREEMENT_TERMS and AGREEMENT_TEMRS_URL:
+        mapping[AGREEMENT_TEMRS_URL] = 'TERMS'
 
-    if REGISTRATION_URL in mapping:
-        if ENABLE_AGREEMENT_TERMS and AGREEMENT_TEMRS_URL:
-            mapping[AGREEMENT_TEMRS_URL] = 'TERMS'
-
-        if ENABLE_CONSENT_TO_PROCESSING and CONSENT_TO_PROCESSING_URL:
-            mapping[CONSENT_TO_PROCESSING_URL] = 'CONSENT_TO_PROCESSING'
+    if ENABLE_CONSENT_TO_PROCESSING and CONSENT_TO_PROCESSING_URL:
+        mapping[CONSENT_TO_PROCESSING_URL] = 'CONSENT_TO_PROCESSING'
 
     return mapping
 
@@ -1387,15 +1382,12 @@ def get_accounts_views_mapping():
 ACCOUNT_URLS = lazy(get_accounts_views_mapping, dict)()
 ACCOUNT_URL = 'account/'
 
-REGISTRATION_URL = 'registration/'
-REGISTRATION_ENABLED = main['enable_registration']
-
 AGREEMENT_TEMRS_URL = 'terms/'
-ENABLE_AGREEMENT_TERMS: bool = main.getboolean('enable_agreement_terms', fallback=REGISTRATION_ENABLED)
+ENABLE_AGREEMENT_TERMS: bool = main.getboolean('enable_agreement_terms', fallback=False)
 AGREEMENT_TERMS_PATH: str = main['agreement_terms_path']
 
 CONSENT_TO_PROCESSING_URL = 'consent_to_processing/'
-ENABLE_CONSENT_TO_PROCESSING: bool = main.getboolean('enable_consent_to_processing', fallback=REGISTRATION_ENABLED)
+ENABLE_CONSENT_TO_PROCESSING: bool = main.getboolean('enable_consent_to_processing', fallback=False)
 CONSENT_TO_PROCESSING_PATH: str = main['consent_to_processing_path']
 
 ENABLE_USER_SELF_REMOVE: bool = main.getboolean('enable_user_self_remove', fallback=False)
@@ -1417,19 +1409,6 @@ def get_accounts_views_mapping():
 
 SPA_STATIC: _t.List[_t.Dict] = []
 
-SPA_STATIC_FILES_PROVIDERS = {
-    'vstutils': {
-        'BACKEND': 'vstutils.static_files.WebpackJsonStaticObjectHandler',
-        'OPTIONS': {
-            'priority': 1,
-            'entrypoint_name': 'spa',
-        }
-    },
-    'oldstyle': {
-        'BACKEND': 'vstutils.static_files.SPAStaticObjectHandler',
-    }
-}
-
 # Centrifugo settings
 CENTRIFUGO_CLIENT_KWARGS = config['centrifugo'].all()
 CENTRIFUGO_PUBLIC_HOST = CENTRIFUGO_CLIENT_KWARGS.pop('public_address', None) or CENTRIFUGO_CLIENT_KWARGS.get('address')
@@ -1491,6 +1470,18 @@ def get_default_storage_class():
 
 DOCKERRUN_MIGRATE_LOCK_TIMEOUT = config['docker'].getint('migrate_lock_timeout', 15)
 
+API_ONLY = False
+
+# Default auth views
+##############################################################
+DEFAULT_REGISTRATION_VIEW_ENABLE: bool = True
+DEFAULT_REGISTRATION_VIEW_SERIALIZER_CLASS: str = 'vstutils.api.registration.serializers.UserRegistrationSerializer'
+DEFAULT_REGISTRATION_VIEW_CONFIRMATION_LINK: str = '/#/auth/registration/confirm-email/{code}'
+
+DEFAULT_PASSWORD_RESET_VIEW_ENABLE: bool = True
+DEFAULT_PASSWORD_RESET_VIEW_CONFIRMATION_LINK: str = '/#/auth/password-reset/{uid}/{token}'
+
+
 # WebPush settings
 ##############################################################
 webpush_section = config['webpush']
@@ -1503,6 +1494,99 @@ def get_default_storage_class():
 WEBPUSH_USER_SETTINGS_VIEW_SUBPATH = 'push_notifications'
 
 
+# OAuth
+##############################################################
+class OauthServerClientConfig(_t.TypedDict):
+    allowed_grant_types: list[
+        _t.Literal[
+            'authorization_code',
+            'implicit',
+            'client_credentials',
+            'password',
+            'refresh_token',
+        ]
+    ]
+    secret: _t.Optional[str]
+    allowed_redirect_uris: _t.Optional[list[str]]
+    allowed_response_types: _t.Optional[
+        list[
+            _t.Literal[
+                'code id_token token',
+                'code id_token',
+                'code token',
+                'code',
+                'id_token token',
+                'id_token',
+                'token',
+            ]
+        ]
+    ]
+    token_endpoint_auth_methods: _t.Optional[
+        list[
+            _t.Literal[
+                'same_origin',
+                'client_secret_post',
+                'client_secret_basic',
+                'none',
+            ]
+        ]
+    ]
+    default_redirect_uri: _t.Optional[str]
+
+OauthServerClientsConfig = dict[str, OauthServerClientConfig]
+
+OAUTH_SERVER_URL: str = config['oauth']['server_url']
+OAUTH_SERVER_TOKEN_ENDPOINT_PATH: str = config['oauth']['server_token_endpoint_path']
+OAUTH_SERVER_SCHEMA_CLIENT_ID: str = config['oauth']['server_schema_client_id']
+
+OAUTH_SERVER_ENABLE: bool = config['oauth']['server_enable']
+OAUTH_SERVER_ISSUER: str = env.str(f'{ENV_NAME}_OAUTH_SERVER_ISSUER', None) or config['oauth']['server_issuer']
+OAUTH_SERVER_CLASS: str = config['oauth']['server_class']
+OAUTH_SERVER_ENABLE_ANON_LOGIN: bool = config['oauth']['server_enable_anon_login']
+OAUTH_SERVER_PASSWORD_GRANT_ADDITIONAL_EXTENSIONS: list[str] = []
+OAUTH_SERVER_AUTHORIZATION_CODE_GRANT_ADDITIONAL_EXTENSIONS: list[str] = []
+OAUTH_SERVER_JWT_ALG: str = config['oauth']['server_jwt_alg']
+OAUTH_SERVER_JWT_KEY: str = env.str(f'{ENV_NAME}_OAUTH_SERVER_JWT_KEY', None) or config['oauth']['server_jwt_key']
+OAUTH_SERVER_JWT_EXTRA_CLAIMS_PROVIDER: _t.Optional[str] = config['oauth']['server_jwt_extra_claims_provider']
+OAUTH_SERVER_TOKEN_EXPIRES_IN: int = config['oauth']['server_token_expires_in']
+OAUTH_SERVER_ID_TOKEN_EXPIRES_IN: int = config['oauth']['server_id_token_expires_in']
+OAUTH_SERVER_CLIENT_AUTHENTICATION_METHODS: list[str] = config['oauth']['server_client_authentication_methods']
+OAUTH_SERVER_AUTHORIZATION_ENDPOINT: _t.Optional[str] = config['oauth']['server_authorization_endpoint']
+OAUTH_SERVER_AUTHORIZATION_CODE_CACHE_NAME: str = 'session'
+OAUTH_SERVER_CLIENTS: OauthServerClientsConfig = {
+    config['oauth']['server_simple_client_id']: {
+        'secret': config['oauth']['server_simple_client_secret'],
+        'token_endpoint_auth_methods': ['same_origin', 'client_secret_post', 'client_secret_basic'],
+        'allowed_grant_types': ['password', 'refresh_token'],
+        'allowed_redirect_uris': None,
+        'allowed_response_types': None,
+        'default_redirect_uri': None,
+    }
+}
+
+if OAUTH_SERVER_ENABLE:
+    if config['oauth']['server_allow_insecure']:
+        os.environ['AUTHLIB_INSECURE_TRANSPORT'] = '1'
+
+    API['oauth2'].update({
+        'token': {
+            'view': 'vstutils.oauth2.endpoints.TokenViewSet',
+            'type': 'view',
+        },
+        'revoke': {
+            'view': 'vstutils.oauth2.endpoints.RevokeTokenViewSet',
+            'type': 'view',
+        },
+        'userinfo': {
+            'view': 'vstutils.oauth2.endpoints.UserInfoView',
+            'type': 'view',
+        },
+        'introspect': {
+            'view': 'vstutils.oauth2.endpoints.TokenIntrospectionViewSet',
+            'type': 'view',
+        },
+    })
+
 # Test settings for speedup tests
 ##############################################################
 if TESTS_RUN:
diff --git a/vstutils/static_files.py b/vstutils/static_files.py
deleted file mode 100644
index 4acd1500..00000000
--- a/vstutils/static_files.py
+++ /dev/null
@@ -1,68 +0,0 @@
-import traceback
-from pathlib import Path
-from logging import getLogger
-
-from orjson import loads
-from django.conf import settings
-from django.utils.functional import cached_property
-from vstutils.utils import StaticFilesHandlers
-
-
-logger = getLogger('vstutils')
-
-
-class BaseStaticObjectHandler:
-    __slots__ = ('name', 'priority')
-
-    def __init__(self, name, priority=254):
-        self.name = name
-        self.priority = priority
-
-    def get_spa_static_list(self):
-        return ()  # nocv
-
-    @cached_property
-    def spa_static_list(self):
-        return self.get_spa_static_list()
-
-
-class SPAStaticObjectHandler(BaseStaticObjectHandler):
-    def get_spa_static_list(self):
-        return tuple(settings.SPA_STATIC)
-
-
-class WebpackJsonStaticObjectHandler(BaseStaticObjectHandler):
-    __slots__ = ('json_file', 'prefix', 'entrypoint_name', '__dict__')
-
-    def __init__(self, *args, **kwargs):
-        self.json_file = kwargs.pop('json_file', str(Path(settings.VSTUTILS_DIR)/'static/bundle/output.json'))
-        self.prefix = kwargs.pop('prefix', str(Path(self.json_file.split('/static/')[-1]).parent))
-        self.entrypoint_name = kwargs.pop('entrypoint_name', kwargs.get('name'))
-        super().__init__(*args, **kwargs)
-
-    @cached_property
-    def spa_static_list(self):
-        return tuple(self.get_static_files_paths(self.get_static_files()))
-
-    def get_static_files_paths(self, files_list):
-        for obj in files_list:
-            path = Path(obj['name'])
-            priority = self.priority
-            if path.stem != self.entrypoint_name:
-                priority -= 1
-            yield {
-                'priority': priority,
-                'type': path.suffix.replace('.', '') or 'js',
-                'name': str(self.prefix / path),
-                'source': self.name,
-            }
-
-    def get_static_files(self):
-        with open(self.json_file, encoding='utf-8') as fd:
-            try:
-                return loads(fd.read())['entrypoints'][self.entrypoint_name]['assets']
-            except:  # nocv
-                logger.exception(traceback.format_exc())
-
-
-SPA_STATIC_FILES_PROVIDERS = StaticFilesHandlers('SPA_STATIC_FILES_PROVIDERS')
diff --git a/vstutils/templates/auth/base.html b/vstutils/templates/auth/base.html
deleted file mode 100755
index 03abf404..00000000
--- a/vstutils/templates/auth/base.html
+++ /dev/null
@@ -1,68 +0,0 @@
-{% extends "base.html" %}
-{% load request_static %}
-
-{% block login_body_content %}
-    <p class="login-box-msg">{% translate_text "sign in to start your session" capfirst %}
-        {% block session_message_suffix %}
-        {% if registration_enabled %}
-        {% translate_text "or" %} <a href="{% url 'user_registration' %}">{% translate_text "sign up" %}</a>.
-        {% endif %}
-        {% endblock %}</p>
-
-        {% if wait_confirmation %}
-            <div class="warning">{% translate_text "confirm your email before logging in" capfirst %}</div>
-            <br>
-        {% endif %}
-    <form method="post" action="{% url 'login' %}" class="app-form-signin form-signin" id="login_form">
-        {% csrf_token %}
-        {% block auth_key %}
-        <div class="form-group has-feedback">
-            <input type="text"
-                class="form-control"
-                placeholder="{% translate_text "username" capfirst %}"
-                name='{{ form.username.name }}'
-                id="{{ form.username.name }}"
-                maxlength="254"
-                autocomplete="username"
-                required autofocus>
-        </div>
-        {% endblock %}
-        <div class="form-group has-feedback">
-            <input type="password"
-                class="form-control"
-                placeholder="{% translate_text "password" capfirst %}"
-                name='{{ form.password.name }}'
-                id="{{ form.password.name }}"
-                autocomplete="current-password">
-        </div>
-
-        {% block button %}
-            <div class="row">
-                <div class="col-xs-4">
-                    <button type="submit" class="btn btn-primary btn-block" style="margin-bottom: 5px" id="login_button">{% translate_text "sign in" title %}</button>
-                    {% block additional_link %}
-                        <a style="margin-bottom: 10px" href="{% url 'password_reset' %}">{% translate_text "forgot password" title %}?</a>
-                    {% endblock %}
-                </div>
-            </div>
-        {% endblock %}
-        <input id="next" type="hidden" name="next" value="{{ next }}" />
-        {% if form.errors %}
-            {% translate_errors form.non_field_errors %}
-        {% endif %}
-    </form>
-    <script>
-        // Set form field next to current url for ?next= redirects
-        var match = /next=(?<next>[^&]+)/.exec(window.location.href);
-        if (match && match.groups.next) {
-            document.getElementById('next').value = match.groups.next
-        }
-
-        // Service worker may need to know that user is no longer signed in
-        if ("serviceWorker" in navigator) {
-            navigator.serviceWorker.getRegistration().then((registration) => {
-                registration.active.postMessage("authPageOpened");
-            });
-        }
-    </script>
-{% endblock %}
diff --git a/vstutils/templates/auth/login.html b/vstutils/templates/auth/login.html
deleted file mode 100644
index 1e8460b8..00000000
--- a/vstutils/templates/auth/login.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "auth/base.html" %}
\ No newline at end of file
diff --git a/vstutils/templates/auth/tfa.html b/vstutils/templates/auth/tfa.html
deleted file mode 100644
index ededf9a2..00000000
--- a/vstutils/templates/auth/tfa.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends "base.html" %}
-
-{% block login_body_content %}
-    <form method="post" action="{% url 'login' %}" class="app-form-signin form-signin" id="login_form">
-        {% csrf_token %}
-        <div class="form-group has-feedback">
-            <label for="{{ form.pin.name }}">{% translate_text "two-factor authentication code" capfirst %}</label>
-            <input type="text"
-                class="form-control"
-                name='{{ form.pin.name }}'
-                id="{{ form.pin.name }}"
-                required autofocus>
-
-            {% translate_errors form.pin.errors %}
-
-            <p class="pin-desc">{% translate_text "Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes." %}</p>
-
-            <button type="submit" class="btn btn-primary btn-block" style="margin-bottom: 5px">
-                {% translate_text "verify code" capfirst %}
-            </button>
-            <hr>
-            <a href="{% url 'logout' %}">{% translate_text "logout" capfirst %}</a>
-        </div>
-    </form>
-    <style>
-        input {
-            margin: 10px 0;
-        }
-        .pin-desc {
-            margin: 10px 0;
-        }
-    </style>
-{% endblock %}
diff --git a/vstutils/templates/gui/base.html b/vstutils/templates/gui/base.html
index 98f5ea75..95a91198 100644
--- a/vstutils/templates/gui/base.html
+++ b/vstutils/templates/gui/base.html
@@ -2,43 +2,10 @@
 {% load request_static %}
 {% load cache %}
 
-{% block gui_init_scripts %}
-    <script type="text/javascript">
-        // {% block gui_init_vars %}
-        window.isDebug = {{ debug|yesno:"true,false" }};
-
-        window.host_url = "{{ host_url }}";
-        window.endpoint_url = "{{ host_url }}{{ endpoint_path }}";
-        window.openapi_path = window.endpoint_url;
-
-        window.project_gui_name = "{{ project_gui_name }}";
-
-        window.project_version = "{{ project_version }}";
-        window.gui_version = "{{ gui_version }}";
-        window.gui_user_version = "{{ gui_user_version }}";
-
-        window.is_superuser = {{ user.is_superuser|yesno:"true,false" }};
-        window.is_staff = {{ user.is_staff|yesno:"true,false" }};
-
-        // {% endblock %}
-        // {% block gui_static_list %}
-        window.resourceList = [
-            // {% for file in static_files_list %}
-                { priority: Number('{{ file.priority }}'), type: '{{ file.type }}', name: '{% static file.name %}?v={{file.version}}'},
-            // {% endfor %}
-        ];
-        // {% endblock %}
-    </script>
-{% endblock %}
-
 {% block body %}
     <body class="sidebar-mini {% block bodyclass %}{% endblock %}">
         <div id="RealBody"></div>
 
         {% block script %}{% endblock %}
-
-        {% block app_loader %}
-            <script src="{% static 'bundle/app_loader.js' %}?v={{ vstutils_version }}"></script>
-        {% endblock %}
     </body>
 {% endblock %}
\ No newline at end of file
diff --git a/vstutils/templates/registration/api_password_reset_email.html b/vstutils/templates/registration/api_password_reset_email.html
new file mode 100644
index 00000000..ac7f10c3
--- /dev/null
+++ b/vstutils/templates/registration/api_password_reset_email.html
@@ -0,0 +1,5 @@
+{% extends "registration/password_reset_email.html" %}
+
+{% block reset_link %}
+{{ reset_link }}
+{% endblock %}
diff --git a/vstutils/templates/registration/base.html b/vstutils/templates/registration/base.html
deleted file mode 100644
index e3ad3e62..00000000
--- a/vstutils/templates/registration/base.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{% extends "auth/base.html" %}
-{% load request_static %}
diff --git a/vstutils/templates/registration/base_agreements.html b/vstutils/templates/registration/base_agreements.html
index 99032048..6a065dfd 100644
--- a/vstutils/templates/registration/base_agreements.html
+++ b/vstutils/templates/registration/base_agreements.html
@@ -1,4 +1,4 @@
-{% extends "registration/base.html" %}
+{% extends "base.html" %}
 
 {% block login_body_content %}
     <style>
diff --git a/vstutils/templates/registration/password_reset_complete.html b/vstutils/templates/registration/password_reset_complete.html
deleted file mode 100644
index 6b980e84..00000000
--- a/vstutils/templates/registration/password_reset_complete.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "registration/base.html" %}
-
-{% block content %}
-    <p style="color: #000000; margin-bottom: 25px">{% translate_text "Your password has been set.  You may go ahead and log in now." %}</p>
-    <button class="btn btn-primary"><a style="color: #ffffff" href="{{ login_url }}">{% translate_text "sign in" capfirst %}</a></button>
-{% endblock %}
\ No newline at end of file
diff --git a/vstutils/templates/registration/password_reset_confirm.html b/vstutils/templates/registration/password_reset_confirm.html
deleted file mode 100644
index 893b194f..00000000
--- a/vstutils/templates/registration/password_reset_confirm.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% extends "registration/base.html" %}
-
-{% block login_body_content %}
-    {% if validlink %}
-        <p>{% translate_text "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
-        <form method="post">
-            {% csrf_token %}
-            <fieldset class="module aligned">
-                <div style="margin-bottom: 25px">
-                    <div style="margin: 0 auto 25px auto;width: min-content;clear:both; text-align:right; line-height:25px;">
-                        {{ form.new_password1.errors }}
-                        <label for="id_new_password1" class="password-reset-label">{% translate_text "new password" capfirst %}:</label>
-                        {{ form.new_password1 }}
-                    </div>
-                    <div style="margin: 0 auto 25px auto;width: min-content;clear:both; text-align:right; line-height:25px;">
-                        {{ form.new_password2.errors }}
-                        <label for="id_new_password2" class="password-reset-label">{% translate_text "confirm password" title %}:</label>
-                        {{ form.new_password2 }}
-                    </div>
-                </div>
-                <div style="text-align: center">
-                    <input type="submit" value="{% translate_text 'change my password' capfirst %}" class="btn btn-primary">
-                </div>
-            </fieldset>
-        </form>
-    {% else %}
-        <p>{% translate_text "The password reset link was invalid, possibly because it has already been used. Please request a new Password reset." %}</p>
-    {% endif %}
-{% endblock %}
\ No newline at end of file
diff --git a/vstutils/templates/registration/password_reset_done.html b/vstutils/templates/registration/password_reset_done.html
deleted file mode 100644
index b90ddead..00000000
--- a/vstutils/templates/registration/password_reset_done.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "registration/base.html" %}
-
-{% block login_body_content %}
-    <p style="color: #000000">{% translate_text "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly." %}</p>
-    <p style="color: #000000">{% translate_text "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder." %}</p>
-{% endblock %}
\ No newline at end of file
diff --git a/vstutils/templates/registration/password_reset_form.html b/vstutils/templates/registration/password_reset_form.html
deleted file mode 100644
index 6662bdc1..00000000
--- a/vstutils/templates/registration/password_reset_form.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "registration/base.html" %}
-
-{% block login_body_content %}
-    <p style="color: #000000">{% translate_text "Forgot your password? Enter your email address below, and an email with instructions for setting a new one will be sent." %}</p>
-
-    <form method="post">
-        {% csrf_token %}
-        <fieldset class="module aligned">
-            <div style="margin: 0 auto 25px auto;width: min-content;">
-                {{ form.email.errors }}
-                <label for="id_email" style="color: #000000; margin-right: 10px">Email:</label>
-                {{ form.email }}
-            </div>
-            <div style="text-align: center">
-                <input type="submit" value='{% translate_text "reset my Password" capfirst %}' class="btn btn-primary">
-            </div>
-        </fieldset>
-    </form>
-{% endblock %}
\ No newline at end of file
diff --git a/vstutils/templates/registration/user_registration.html b/vstutils/templates/registration/user_registration.html
deleted file mode 100644
index 01d45f1d..00000000
--- a/vstutils/templates/registration/user_registration.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{% extends "registration/base.html" %}
-{% load vst_html_tags %}
-
-{% block bodyclass %}register-page{% endblock %}
-{% block login_body_content %}
-    {% if uid %}
-        <script>
-            const uid = '{{uid | safe}}';
-            const form = document.createElement("form");
-            const uidInput = document.createElement("input");
-            const csrfInput = document.createElement("input")
-            form.method = "POST";
-            form.action = document.location.href.replace(document.location.search, '');
-            uidInput.value = uid;
-            uidInput.name = "uid";
-            uidInput.type = "hidden";
-            csrfInput.value = document.cookie.match(/csrftoken=(.+?)(;|$)/)[1];
-            csrfInput.name = "csrfmiddlewaretoken";
-            csrfInput.type = "hidden";
-            form.appendChild(uidInput);
-            form.appendChild(csrfInput);
-            document.body.appendChild(form);
-            form.submit();
-        </script>
-    {% endif %}
-    <div class="login-box password-reset">
-        {% if form.errors.uid %}
-            {% translate_errors form.uid.errors %}
-        {% endif %}
-        <form method="post">
-            {% csrf_token %}
-
-            {% block base_registration_fields %}
-                {% bootstrap_form form %}
-            {% endblock %}
-
-            {% block additional_registration_fields %}
-            {% endblock %}
-            <div style="text-align: center; clear: both">
-                <input type="submit" value="{% translate_text "register" capfirst %}" class="btn btn-primary">
-            </div>
-        </form>
-    </div>
-{% endblock %}
-
-{% block after_content %}
-    {% block registration_confirmation_script %}
-    {% endblock %}
-{% endblock %}
diff --git a/vstutils/templates/vst_inclusion_tags/bootstrap_form.html b/vstutils/templates/vst_inclusion_tags/bootstrap_form.html
deleted file mode 100644
index 690aa630..00000000
--- a/vstutils/templates/vst_inclusion_tags/bootstrap_form.html
+++ /dev/null
@@ -1,22 +0,0 @@
-{% for field in fields %}
-    {% if field.hidden %}
-        {{ field.bound }}
-    {% else %}
-        <div class="form-group {{ field.classes }}">
-            {% if field.label_first %}<label for="{{ field.bound.id_for_label }}" class="{{ field.bound.label_classes }}">{{ field.label }}</label>{% endif %}
-            {% if field.errors %}
-                <div class="alert alert-danger" role="alert">
-                    {{ field.errors }}
-                </div>
-            {% endif %}
-            {{ field.bound }}
-            {% if field.label_last %}<label for="{{ field.bound.id_for_label }}" class="{{ field.label_classes }}">{{ field.label }}</label>{% endif %}
-        </div>
-    {% endif %}
-{% endfor %}
-
-{% if form_errors %}
-    <div class="alert alert-danger" role="alert">
-        {{ form_errors }}
-    </div>
-{% endif %}
diff --git a/vstutils/templates/widgets/agreement_widget.html b/vstutils/templates/widgets/agreement_widget.html
deleted file mode 100644
index 14706dfc..00000000
--- a/vstutils/templates/widgets/agreement_widget.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% include "django/forms/widgets/checkbox.html" %}
-
-<div class="modal fade" id="modal-{{ widget.name }}" style="display: none;" aria-hidden="true">
-    <div class="modal-dialog modal-lg modal-dialog-centered">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body" style="height: 80vh; padding: 0">
-                <div class="embed-responsive" style="height: 100%">
-                    <iframe id="{{ widget.name }}-iframe"></iframe>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script>
-    function open{{ widget.name }}Modal(url_value) {
-        $('#modal-{{ widget.name }}').modal('show');
-        const dataIframe = document.getElementById('{{ widget.name }}-iframe');
-
-        dataIframe.setAttribute('src', url_value);
-        dataIframe.addEventListener('load', () => {
-            let doc = dataIframe.contentDocument;
-            doc.body.innerHTML = doc.body.innerHTML +
-                `<style>
-                    #lang-form, .login-logo {display: none;}
-                    body {background-color: #fff !important; justify-content: start !important;}
-                </style>`;
-        });
-    }
-</script>
\ No newline at end of file
diff --git a/vstutils/templatetags/translation.py b/vstutils/templatetags/translation.py
index 9352e982..ed92f952 100644
--- a/vstutils/templatetags/translation.py
+++ b/vstutils/templatetags/translation.py
@@ -48,23 +48,6 @@ def handle_token(cls, parser, token):
         return cls(parser.compile_filter(bits[1]), bits[2:])
 
 
-class TranslateErrorsTag(template.Node):
-    def __init__(self, errors_list):
-        self.errors_list = errors_list
-
-    def render(self, context):
-        trans = context.request.language.translate
-        result = ''
-        errors = self.errors_list.resolve(context)
-        for error in errors.as_data():
-            translated = trans(str(error.message))
-            if error.params:
-                translated = translated % {k: trans(v) for k, v in error.params.items()}
-            result += f'<li>{translated}</li>'
-
-        return f'<ul class="form-errors">{result}</ul>'
-
-
 @register.tag('translate_text')
 def translate_text(parser, token):
     """
@@ -79,17 +62,3 @@ def translate_text(parser, token):
         {% translate_text "username" capfirst cut:" "  %}
     """
     return TranslateTag.handle_token(parser, token)
-
-
-@register.tag('translate_errors')
-def translate_errors(parser, token):
-    """
-    Translates every error and its parameters from given ErrorList and renders it in ul list
-
-    Usage:
-        {% translate_errors form.non_field_errors %}
-    """
-    bits = token.split_contents()
-    if len(bits) < 2:
-        raise template.TemplateSyntaxError('translate_errors takes at least one argument')  # nocv
-    return TranslateErrorsTag(template.Variable(bits[1]))
diff --git a/vstutils/templatetags/vst_html_tags.py b/vstutils/templatetags/vst_html_tags.py
index 83cc62df..117639b6 100644
--- a/vstutils/templatetags/vst_html_tags.py
+++ b/vstutils/templatetags/vst_html_tags.py
@@ -1,8 +1,5 @@
 import orjson
-from django import template, forms
-from django.core.exceptions import NON_FIELD_ERRORS
-
-from ..utils import translate as _
+from django import template
 
 register = template.Library()
 
@@ -22,45 +19,3 @@ def img_from_json(json_string, **kwargs):
         'tag_classes': tag_classes,
         'content': content
     }
-
-
-def _handle_form_fields(form):
-    for name, field in form.fields.items():
-        field = form[name]
-        errors = field.errors
-        label = field.label
-        classes = []
-        label_classes = []
-        label_first = True
-        hidden = False
-        if hasattr(field.field, 'get_bootstrap_label'):
-            label = field.field.get_bootstrap_label(field)
-        else:
-            label = _(label)
-        if isinstance(field.field, forms.BooleanField):
-            classes.append('form-check')
-            label_classes.append('form-check-label')
-            label_first = False
-        if isinstance(field.field.widget, forms.widgets.HiddenInput):
-            hidden = True
-        field.field.widget.attrs['class'] = 'form-control' + (field.field.widget.attrs.get('class', '') or '')
-        yield {
-            'name': name,
-            'label': label,
-            'bound': field,
-            'errors': errors,
-            'classes': ' '.join(classes),
-            'label_classes': ' '.join(label_classes),
-            'label_first': label_first,
-            'label_last': not label_first,
-            'hidden': hidden,
-        }
-
-
-@register.inclusion_tag('vst_inclusion_tags/bootstrap_form.html')
-def bootstrap_form(form: forms.Form, **kwargs):
-    return {
-        'fields': _handle_form_fields(form),
-        'form': form,
-        'form_errors': form.errors.get(NON_FIELD_ERRORS, '')
-    }
diff --git a/vstutils/tests.py b/vstutils/tests.py
index 1efd8a03..415cf0d0 100644
--- a/vstutils/tests.py
+++ b/vstutils/tests.py
@@ -13,7 +13,6 @@
 from django.http import StreamingHttpResponse
 from django.db import transaction, models as django_models
 from django.core.exceptions import BadRequest
-from django.urls import reverse
 from django.conf import settings
 from django.test import TestCase, override_settings  # noqa: F401
 from django.contrib.auth import get_user_model
@@ -100,7 +99,9 @@ def _login(self):
         return client
 
     def _logout(self, client):
-        self.assertEqual(client.post(self.logout_url).status_code, 302)
+        saved_cookies = client.cookies
+        client.logout()
+        client.cookies = saved_cookies
 
     def _check_update(self, url, data, **fields):
         """
@@ -149,9 +150,6 @@ def setUp(self):
         }
         self.client = self.client_class(**self.client_kwargs)
         self.user = self._create_user()
-        self.login_url = reverse('login')
-        self.confirmation_redirect_url = self.login_url + '?confirmation=true'
-        self.logout_url = reverse('logout')
         self.last_response = None
 
     def _settings(self, item, default=None):
@@ -163,18 +161,6 @@ def random_name(self) -> _t.Text:
         """
         return str(uuid.uuid1())
 
-    def call_registration(self, data, **kwargs):
-        """
-        Function for calling registration. Just got form data and headers.
-
-        :param data: Registration form data.
-        :type data: dict
-        :param kwargs: named arguments with request headers.
-        """
-
-        client = self.client_class(**self.client_kwargs)
-        return client.post(reverse('user_registration'), data=data, **kwargs)
-
     def get_url(self, *items) -> _t.Text:
         """
         Function for creating url path based on ``VST_API_URL`` and ``VST_API_VERSION`` settings.
@@ -451,6 +437,7 @@ def endpoint_call(self, data: BulkDataType = None, method: str = 'get', code: in
             f'/{self._settings("VST_API_URL")}/endpoint/{query}',
             data=data,
             code=code,
+            headers=headers,
             **kwargs
         )
 
diff --git a/vstutils/translations/cn.py b/vstutils/translations/cn.py
index bcaf562a..d65edc69 100644
--- a/vstutils/translations/cn.py
+++ b/vstutils/translations/cn.py
@@ -64,6 +64,25 @@
     'Go back': '返回',
     'Selected instances were successfully removed': '选定的实例已成功删除',
     'Cannot parse CSV file in field "{fieldName}"': '无法解析字段“{fieldName}”中的CSV文件',
+    'sign in to start your session': '登录开始会议',
+    'sign in': '进入',
+    'sign up': '请注册',
+    'forgot password': '忘记密码',
+    'register': '注册',
+    'You have successfully registered. Please check your email for a confirmation link.': '您已成功注册。 请检查您的电子邮件以获取确认链接。',
+    'An error occurred. Please try again later.': '发生错误。 请稍后再试。',
+    'User with this username already exists.': '具有此用户名的用户已存在。',
+    'Confirmation link is invalid or expired.': '确认链接无效或已过期。',
+    'Reset my Password': '问密码',
+    'Forgot your password? Enter your email address below, and an email with instructions for setting a new one will be sent.': '忘记密码了吗？ 输入您的地址，我们将向您发送恢复指示',
+    'Confirm password': '确认密码',
+    'Invalid link. Please request a new one.': '无效的链接。 请请求一个新的。',
+    'Change my Password': '更改密码',
+    'Invalid username or password': '无效的用户名或密码',
+    'Authentication code': '验证代码',
+    'Confirmation code is invalid or expired.': '确认代码无效或已过期。',
+    'Error! Try again later': '错误！ 稍后再试',
+    'Invalid code': '无效代码',
 
     # fields
     'Id': '标识符',
@@ -310,17 +329,9 @@
     'terms of agreement': '协议条款',
 
     #auth/reg
-    'sign in to start your session': '登录开始会议',
     'confirm your email before logging in': '登录前确认您的电子邮件',
     'Confirmation link is invalid or expired': '确认链接无效或过期',
-    'sign in': '进入',
-    'sign up': '请注册',
-    'forgot password': '忘记密码',
-    'confirm password': '确认密码',
-    'register': '注册',
     'fields with * is required': '标有*为必填项',
-    'Forgot your password? Enter your email address below, and an email with instructions for setting a new one will be sent.': '忘记密码了吗？ 输入您的地址，我们将向您发送恢复指示',
-    'reset my Password': '问密码',
     'Invalid authentication code': '无效的授权码',
     'Secret string must be provided': '必须提供秘密字符串',
     'Confirm your account': '确认您的帐户',
diff --git a/vstutils/translations/ru.py b/vstutils/translations/ru.py
index c1a7335d..f9a74dce 100644
--- a/vstutils/translations/ru.py
+++ b/vstutils/translations/ru.py
@@ -64,6 +64,25 @@
     'Go back': 'Вернуться назад',
     'Selected instances were successfully removed': 'Выбранные объекты были успешно удалены',
     'Cannot parse CSV file in field "{fieldName}"': 'Не удалось разобрать CSV файл в поле "{fieldName}"',
+    'sign in to start your session': 'Войдите, чтобы начать сеанс',
+    'sign in': 'войти',
+    'sign up': 'зарегистрируйтесь',
+    'forgot password': 'забыли пароль',
+    'register': 'регистрация',
+    'You have successfully registered. Please check your email for a confirmation link.': 'Вы успешно зарегистрировались. Пожалуйста, проверьте свою электронную почту на наличие ссылки для подтверждения.',
+    'An error occurred. Please try again later.': 'Произошла ошибка. Пожалуйста, попробуйте позже.',
+    'User with this username already exists.': 'Пользователь с таким именем уже существует.',
+    'Confirmation link is invalid or expired.': 'Ссылка для подтверждения недействительна или устарела.',
+    'Reset my Password': 'Сбросить пароль',
+    'Forgot your password? Enter your email address below, and an email with instructions for setting a new one will be sent.': 'Забыли пароль? Введите свой адрес, и мы отправим вам инструкцию для восстановления.',
+    'Confirm password': 'Подтвердите пароль',
+    'Invalid link. Please request a new one.': 'Неверная ссылка. Пожалуйста, запросите новую.',
+    'Change my Password': 'Изменить пароль',
+    'Invalid username or password': 'Неверное имя пользователя или пароль',
+    'Authentication code': 'Код аутентификации',
+    'Confirmation code is invalid or expired.': 'Код подтверждения недействителен или устарел.',
+    'Error! Try again later': 'Ошибка! Попробуйте позже',
+    'Invalid code': 'Неверный код',
 
     # fields
     'Id': 'Идентификатор',
@@ -310,17 +329,9 @@
     'terms of agreement': 'лицензионное соглашение',
 
     # auth/reg
-    'sign in to start your session': 'Войдите, чтобы начать сеанс',
     'confirm your email before logging in': 'подтвердите свою электронную почту перед входом',
     'Confirmation link is invalid or expired': 'Ссылка для подтверждения неверна или устарела',
-    'sign in': 'войти',
-    'sign up': 'зарегистрируйтесь',
-    'forgot password': 'забыли пароль',
-    'confirm password': 'подтвердите пароль',
-    'register': 'регистрация',
     'fields with * is required': 'поля отмеченые * обязательны для заполнения',
-    'Forgot your password? Enter your email address below, and an email with instructions for setting a new one will be sent.': 'Забыли пароль? Введите свой адрес, и мы отправим вам инструкцию для восстановления.',
-    'reset my Password': 'сбросить пароль',
     'Invalid authentication code': 'Неверный код авторизации',
     'Secret string must be provided': 'Секретная строка должна быть заполнена',
     'Confirm your account': 'Подтвердите свой аккаунт',
diff --git a/vstutils/translations/vi.py b/vstutils/translations/vi.py
index 333323c2..70e32459 100644
--- a/vstutils/translations/vi.py
+++ b/vstutils/translations/vi.py
@@ -65,6 +65,25 @@
     'Go back': 'Quay lại',
     'Selected instances were successfully removed': 'Các trường hợp đã chọn đã được xóa thành công',
     'Cannot parse CSV file in field "{fieldName}"': 'Không thể phân tích tệp CSV trong trường "{fieldName}"',
+    'sign in to start your session': 'đăng nhập để bắt đầu',
+    'sign in': 'đăng nhập',
+    'sign up': 'đăng ký',
+    'forgot password': 'quên mật khẩu',
+    'register': 'đăng ký',
+    'You have successfully registered. Please check your email for a confirmation link.': 'Bạn đã đăng ký thành công. Vui lòng kiểm tra email của bạn để xác nhận liên kết.',
+    'An error occurred. Please try again later.': 'Đã xảy ra lỗi. Vui lòng thử lại sau.',
+    'User with this username already exists.': 'Người dùng với tên người dùng này đã tồn tại.',
+    'Confirmation link is invalid or expired.': 'Liên kết xác nhận không hợp lệ hoặc đã hết hạn.',
+    'Reset my Password': 'Đặt lại mật khẩu của tôi',
+    'Forgot your password? Enter your email address below, and an email with instructions for setting a new one will be sent.': 'Quên mật khẩu? Nhập E-mail để nhận hướng dẫn khôi phục mật khẩu',
+    'Confirm password': 'Xác nhận mật khẩu',
+    'Invalid link. Please request a new one.': 'Liên kết không hợp lệ. Vui lòng yêu cầu một liên kết mới.',
+    'Change my Password': 'Thay đổi mật khẩu của tôi',
+    'Invalid username or password': 'Tên người dùng hoặc mật khẩu không hợp lệ',
+    'Authentication code': 'Mã xác thực',
+    'Confirmation code is invalid or expired.': 'Mã xác nhận không hợp lệ hoặc đã hết hạn.',
+    'Error! Try again later': 'Lỗi! Thử lại sau',
+    'Invalid code': 'Mã không hợp lệ',
 
     # fields
     'Id': 'định danh',
@@ -313,17 +332,9 @@
     'terms of agreement': 'các điều khoản của thỏa thuận',
 
     # auth/reg
-    'sign in to start your session': 'đăng nhập để bắt đầu',
     'confirm your email before logging in': 'xác nhận email của bạn trước khi đăng nhập',
     'Confirmation link is invalid or expired': 'Liên kết xác nhận không hợp lệ hoặc hết hạn',
-    'sign in': 'đăng nhập',
-    'sign up': 'đăng ký',
-    'forgot password': 'quên mật khẩu',
-    'confirm password': 'xác nhận mật khẩu',
-    'register': 'đăng ký',
     'fields with * is required': 'các mục có dấu * là bắt buộc',
-    'Forgot your password? Enter your email address below, and an email with instructions for setting a new one will be sent.': 'Quên mật khẩu? Nhập E-mail để nhận hướng dẫn khôi phục mật khẩu',
-    'reset my Password': 'đặt lại mật khẩu của tôi',
     'Invalid authentication code': 'Mã xác thực không hợp lệ',
     'Secret string must be provided': 'Chuỗi bí mật phải được cung cấp',
     'Confirm your account': 'Xác nhận tài khoản của bạn',
diff --git a/vstutils/urls.py b/vstutils/urls.py
index b73640bf..a913ebf4 100644
--- a/vstutils/urls.py
+++ b/vstutils/urls.py
@@ -1,5 +1,4 @@
 # pylint: disable=invalid-name,consider-using-f-string
-import os
 import re
 import functools
 
@@ -16,11 +15,24 @@
 from .api.views import HealthView, MetricsView
 
 static_serve = functools.partial(serve_static, insecure=True)
-gui_enabled = not getattr(settings, 'API_ONLY', False)
+gui_enabled = not settings.API_ONLY
 
+if settings.OAUTH_SERVER_ENABLE:
+    if settings.DEFAULT_REGISTRATION_VIEW_ENABLE:
+        settings.API['oauth2'].setdefault('registration', {
+            'view': 'vstutils.api.registration.views.UserRegistrationViewSet',
+        })
+        settings.API['oauth2'].setdefault('confirm_email', {
+            'view': 'vstutils.api.registration.views.ConfirmEmailViewSet',
+        })
 
-def get_valid_url(*args):
-    return os.path.join('/', *(x.lstrip('^/') for x in filter(bool, args + ('/',))))
+    if settings.DEFAULT_PASSWORD_RESET_VIEW_ENABLE:
+        settings.API['oauth2'].setdefault('password_reset', {
+            'view': 'vstutils.api.password_reset.PasswordResetViewSet',
+        })
+        settings.API['oauth2'].setdefault('password_reset_confirm', {
+            'view': 'vstutils.api.password_reset.PasswordResetConfirmViewSet',
+        })
 
 
 class AdminLoginLogoutRedirectView(RedirectView):
@@ -34,25 +46,19 @@ class AdminLoginLogoutRedirectView(RedirectView):
 if settings.ENABLE_METRICS_VIEW:
     router.register_view('metrics', MetricsView.as_view({'get': 'list'}), 'metrics')
 
-
-admin.site.site_header = 'Admin panel'
-admin.site.site_title = settings.VST_PROJECT
-admin.site.index_title = f"{settings.VST_PROJECT.upper()} Settings Panel"
-admin.site.site_url = "/"
-# TODO: make it depends on 'gui_enabled' when auth migrate to API
-admin.site.login = AdminLoginLogoutRedirectView.as_view(  # type: ignore
-    url=get_valid_url(settings.ACCOUNT_URL, settings.LOGIN_URL)
-)
-admin.site.logout = AdminLoginLogoutRedirectView.as_view(  # type: ignore
-    url=get_valid_url(settings.ACCOUNT_URL, settings.LOGOUT_URL)
-)
+if settings.ENABLE_ADMIN_PANEL:
+    admin.site.site_header = 'Admin panel'
+    admin.site.site_title = settings.VST_PROJECT
+    admin.site.index_title = f"{settings.VST_PROJECT.upper()} Settings Panel"
+    admin.site.site_url = "/"
 doc_url = getattr(settings, 'DOC_URL', '/docs/')[1:]
 
 urlpatterns = list(URLHandlers()) if gui_enabled else []
 
-urlpatterns += [
-    path(settings.ACCOUNT_URL, include(list(URLHandlers('ACCOUNT_URLS'))))
-]
+if gui_enabled and settings.OAUTH_SERVER_ENABLE:
+    urlpatterns += [
+        path(settings.ACCOUNT_URL, include(list(URLHandlers('ACCOUNT_URLS'))))
+    ]
 
 urlpatterns += [
     path('admin/', admin.site.urls),
diff --git a/vstutils/utils.py b/vstutils/utils.py
index 0e6e781a..56db2465 100644
--- a/vstutils/utils.py
+++ b/vstutils/utils.py
@@ -20,6 +20,7 @@
 from functools import lru_cache, wraps
 from pathlib import Path
 from enum import Enum, EnumMeta
+from importlib import import_module
 
 from asgiref.sync import sync_to_async, async_to_sync
 from django.conf import settings
@@ -30,13 +31,16 @@
 from django.core.paginator import Paginator as BasePaginator
 from django.template import loader
 from django.utils import translation, functional
+from django.utils.cache import cc_delim_re
 from django.utils.translation import get_language
 from django.utils.module_loading import import_string
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
 
 from . import exceptions as ex
-from .tools import multikeysort
+
+if tp.TYPE_CHECKING:  # nocv
+    from django.contrib.sessions.backends.base import SessionBase
 
 
 logger: logging.Logger = logging.getLogger('vstutils')
@@ -1252,20 +1256,6 @@ def get_object(self, name, *args, **kwargs):
         return self[name](*args, **opts)
 
 
-class StaticFilesHandlers(ObjectHandlers):
-    def opts(self, name):
-        opts = super().opts(name)
-        opts['name'] = name
-        return opts
-
-    def get_static_objects(self):
-        for name in self.keys():
-            yield from self.get_object(name).spa_static_list
-
-    def get_sorted_list(self):
-        return tuple(multikeysort(self.get_static_objects(), ['priority']))
-
-
 class ModelHandlers(ObjectHandlers):
     """
     Handlers for some models like 'INTEGRATIONS' or 'REPO_BACKENDS'.
@@ -1314,10 +1304,6 @@ class URLHandlers(ObjectHandlers):
     """
     __slots__ = ('additional_handlers', '__handlers__', 'default_namespace')
 
-    settings_urls = [
-        'LOGIN_URL',
-        'LOGOUT_URL'
-    ]
     additional_handlers: tp.List[tp.Text]
 
     def __init__(self, type_name='URLS', *args, **kwargs):
@@ -1360,8 +1346,6 @@ def get_object(self, name, *argv, **kwargs):
         args = options.pop('view_args', argv)
         view_kwargs = options.pop('view_kwargs', {})
         csrf_enable = self.get_backend_data(regexp).get('CSRF_ENABLE', True)
-        if regexp in self.settings_urls:
-            regexp = f'{self.get_django_settings(regexp)[1:]}'
         view_class = self[name]
         namespace = view_kwargs.pop('namespace', self.default_namespace)
         result: tp.Union[tuple, types.ModuleType]
@@ -1477,3 +1461,21 @@ def is_equal(self, cmp_str):
 
     def not_equal(self, cmp_str):
         return not self.is_equal(cmp_str)
+
+
+@lru_cache(maxsize=1)
+def get_session_store() -> 'SessionBase':
+    engine = import_module(settings.SESSION_ENGINE)
+    return engine.SessionStore
+
+
+def add_in_vary(headers: dict, value: str):
+    """
+    Adds provided value to Vary header if not added already
+    """
+    vary = cc_delim_re.split(
+        headers.get('Vary', '').lower()
+    )
+    if value not in vary:
+        vary.append(value)
+        headers['Vary'] = ', '.join(vary)
diff --git a/vstutils/utils.pyi b/vstutils/utils.pyi
index f7a66c51..fb82a8a6 100644
--- a/vstutils/utils.pyi
+++ b/vstutils/utils.pyi
@@ -465,14 +465,6 @@ class ObjectHandlers(BaseVstObject):
         ...
 
 
-class StaticFilesHandlers(ObjectHandlers):
-    def get_static_objects(self) -> Generator[tp.Any, None, None]:
-        ...
-
-    def get_sorted_list(self) -> tp.Tuple:
-        ...
-
-
 class ModelHandlers(ObjectHandlers):
     def get_object(self, name: tp.Text, obj) -> tp.Any:
         ...
@@ -531,3 +523,9 @@ class BaseEnum(str, VstEnum):
 
     def not_equal(self, cmp_str) -> bool:
         ...
+
+def get_session_store():
+    ...
+
+def add_in_vary(headers: dict, value: str):
+    ...
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index b0685d4a..00000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,150 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-const {VueLoaderPlugin} = require('vue-loader');
-
-require('dotenv').config();
-const isProd = process.env.APP_ENV === 'prod';
-const showWarnings = process.env.SHOW_WARNINGS === 'true';
-
-const KB = 1024;
-const frontendSrc = path.resolve(__dirname, 'frontend_src');
-
-const excludeFromSplitNames = ['app_loader', 'doc', 'base'];
-
-module.exports = {
-    mode: isProd ? 'production' : 'development',
-    entry: {
-        'app_loader': path.resolve(frontendSrc, 'app_loader/index.js'),
-        'spa': path.resolve(frontendSrc, 'spa.ts'),
-        'base': path.resolve(frontendSrc, 'base/index.js'),
-    },
-    output: {
-        path: path.resolve(__dirname, 'vstutils/static/bundle'),
-        clean: true,
-        filename: '[name].js',
-        chunkFilename: '[name].chunk.js',
-        library: {
-            name: '[name]',
-            type: 'window',
-        },
-    },
-    plugins: [
-        new webpack.ProvidePlugin({
-            $: 'jquery',
-            jQuery: 'jquery',
-        }),
-        new webpack.IgnorePlugin({ resourceRegExp: /^\.\/locale$/, contextRegExp: /moment$/ }),
-        new VueLoaderPlugin(),
-    ],
-    resolve: {
-        alias: {
-            vue$: 'vue/dist/vue.esm.js',
-            'moment-timezone$': 'moment-timezone/builds/moment-timezone-with-data-10-year-range.min.js',
-            '@': path.resolve(__dirname, 'frontend_src'),
-        },
-        extensions: ['.tsx', '.ts', '.js', '.vue'],
-    },
-    module: {
-        rules: [
-            {
-                test: /\.js$/,
-                loader: 'babel-loader',
-                exclude: [/node_modules/],
-            },
-            {
-                test: /\.ts$/,
-                use: [
-                    'babel-loader',
-                    {
-                        loader: 'ts-loader',
-                        options: {
-                            transpileOnly: true,
-                            appendTsSuffixTo: [/\.vue$/],
-                        }
-                    }
-                ],
-                exclude: [/node_modules/],
-            },
-            {
-                test: /\.((css)|(scss))$/i,
-                use: [
-                    'style-loader',
-                    {
-                        loader: 'css-loader',
-                        options: {
-                            url: {
-                                filter: (url) => !url.startsWith('/static/'),
-                            },
-                        },
-                    },
-                    {
-                        loader: 'sass-loader',
-                        options: {
-                            sassOptions: {
-                                quietDeps: true,
-                            },
-                        },
-                    },
-                ],
-            },
-            {
-                test: /.woff2$/,
-                type: 'asset',
-                parser: {
-                    dataUrlCondition: { maxSize: 100 * KB },
-                },
-            },
-            {
-                test: /.(png|jpg|jpeg|gif|svg|woff|ttf|eot)$/,
-                type: 'asset',
-                parser: {
-                    dataUrlCondition: { maxSize: 10 * KB },
-                },
-            },
-            {
-                test: /\.vue$/,
-                loader: 'vue-loader',
-                options: {
-                    loaders: {
-                        ts: 'ts-loader'
-                    },
-                    esModule: true
-                }
-            },
-        ],
-    },
-    stats: {
-        all: false,
-        entrypoints: true,
-        errors: true,
-        warnings: showWarnings,
-    },
-    optimization: {
-        chunkIds: 'deterministic',
-        splitChunks: {
-            // Do not split app_loader
-            chunks: function (chunk) {
-                return !excludeFromSplitNames.includes(chunk.name);
-            },
-            maxInitialRequests: 10,
-            // https://webpack.js.org/plugins/split-chunks-plugin/#splitchunkscachegroups
-            cacheGroups: {
-                // Disable default vendors cache group
-                defaultVendors: false,
-                // Setup default cache group for everything
-                default: {
-                    priority: 0,
-                },
-                // Setup cache group 'vstutils' with higher priority then 'default' group so
-                // everything under /frontend_src/vstutils/ will go in one 'vstutils.chunk.js' chunk.
-                vstutils: {
-                    name: 'vstutils',
-                    test: /frontend_src\/vstutils\//,
-                    priority: 10,
-                    enforce: true,
-                },
-            },
-        },
-    },
-    cache: isProd ? false : { name: 'vstutils-dev', type: 'filesystem' },
-};
diff --git a/yarn.lock b/yarn.lock
index cfebc868..47db9bdd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8,21 +8,14 @@
   integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
 
 "@ampproject/remapping@^2.2.0":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
-  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@babel/code-frame@^7.0.0":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658"
-  integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
+  integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
   dependencies:
-    "@babel/highlight" "^7.22.5"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
 
-"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.22.5":
+"@babel/code-frame@^7.10.4":
   version "7.22.13"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
   integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
@@ -30,148 +23,67 @@
     "@babel/highlight" "^7.22.13"
     chalk "^2.4.2"
 
-"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9", "@babel/compat-data@^7.23.2":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.2.tgz#6a12ced93455827037bfb5ed8492820d60fc32cc"
-  integrity sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==
-
-"@babel/core@^7.11.6", "@babel/core@^7.12.3":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.9.tgz#bd96492c68822198f33e8a256061da3cf391f58f"
-  integrity sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==
+"@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2":
+  version "7.24.2"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae"
+  integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==
   dependencies:
-    "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.22.5"
-    "@babel/generator" "^7.22.9"
-    "@babel/helper-compilation-targets" "^7.22.9"
-    "@babel/helper-module-transforms" "^7.22.9"
-    "@babel/helpers" "^7.22.6"
-    "@babel/parser" "^7.22.7"
-    "@babel/template" "^7.22.5"
-    "@babel/traverse" "^7.22.8"
-    "@babel/types" "^7.22.5"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.2"
-    semver "^6.3.1"
+    "@babel/highlight" "^7.24.2"
+    picocolors "^1.0.0"
 
-"@babel/core@^7.16.7":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.0.tgz#f8259ae0e52a123eb40f552551e647b506a94d83"
-  integrity sha512-97z/ju/Jy1rZmDxybphrBuI+jtJjFVoz7Mr9yUQVVVi+DNZE333uFQeMOqcCIy1x3WYBIbWftUSLmbNXNT7qFQ==
+"@babel/compat-data@^7.23.5":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.4.tgz#6f102372e9094f25d908ca0d34fc74c74606059a"
+  integrity sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==
+
+"@babel/core@^7.23.9":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.4.tgz#1f758428e88e0d8c563874741bc4ffc4f71a4717"
+  integrity sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
-    "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-module-transforms" "^7.23.0"
-    "@babel/helpers" "^7.23.0"
-    "@babel/parser" "^7.23.0"
-    "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.0"
-    "@babel/types" "^7.23.0"
+    "@babel/code-frame" "^7.24.2"
+    "@babel/generator" "^7.24.4"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helpers" "^7.24.4"
+    "@babel/parser" "^7.24.4"
+    "@babel/template" "^7.24.0"
+    "@babel/traverse" "^7.24.1"
+    "@babel/types" "^7.24.0"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/eslint-parser@^7.16.5":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.22.9.tgz#75f8aa978d1e76c87cc6f26c1ea16ae58804d390"
-  integrity sha512-xdMkt39/nviO/4vpVdrEYPwXCsYIXSSAr6mC7WQsNIlGnuxKyKE7GZjalcnbSWiC4OXGNNN3UQPeHfjSC6sTDA==
-  dependencies:
-    "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
-    eslint-visitor-keys "^2.1.0"
-    semver "^6.3.1"
-
-"@babel/generator@^7.22.9", "@babel/generator@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
-  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
+"@babel/generator@^7.24.1", "@babel/generator@^7.24.4":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.4.tgz#1fc55532b88adf952025d5d2d1e71f946cb1c498"
+  integrity sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==
   dependencies:
-    "@babel/types" "^7.23.0"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
+    "@babel/types" "^7.24.0"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.7.2":
-  version "7.22.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.9.tgz#572ecfa7a31002fa1de2a9d91621fd895da8493d"
-  integrity sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==
-  dependencies:
-    "@babel/types" "^7.22.5"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
-"@babel/helper-annotate-as-pure@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
-  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz#5426b109cf3ad47b91120f8328d8ab1be8b0b956"
-  integrity sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==
-  dependencies:
-    "@babel/types" "^7.22.15"
-
-"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.22.9":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52"
-  integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==
+"@babel/helper-compilation-targets@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
+  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
   dependencies:
-    "@babel/compat-data" "^7.22.9"
-    "@babel/helper-validator-option" "^7.22.15"
-    browserslist "^4.21.9"
+    "@babel/compat-data" "^7.23.5"
+    "@babel/helper-validator-option" "^7.23.5"
+    browserslist "^4.22.2"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.22.11", "@babel/helper-create-class-features-plugin@^7.22.5":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz#97a61b385e57fe458496fad19f8e63b63c867de4"
-  integrity sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/helper-member-expression-to-functions" "^7.22.15"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.9"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    semver "^6.3.1"
-
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz#5ee90093914ea09639b01c711db0d6775e558be1"
-  integrity sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    regexpu-core "^5.3.1"
-    semver "^6.3.1"
-
-"@babel/helper-define-polyfill-provider@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz#a71c10f7146d809f4a256c373f462d9bba8cf6ba"
-  integrity sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.22.6"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-
-"@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.22.5":
+"@babel/helper-environment-visitor@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
   integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
-"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
+"@babel/helper-function-name@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
   integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
@@ -186,24 +98,17 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.22.15":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
-  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
+"@babel/helper-module-imports@^7.22.15":
+  version "7.24.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128"
+  integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==
   dependencies:
-    "@babel/types" "^7.23.0"
+    "@babel/types" "^7.24.0"
 
-"@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.22.5":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
-  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
-  dependencies:
-    "@babel/types" "^7.22.15"
-
-"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9", "@babel/helper-module-transforms@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz#3ec246457f6c842c0aee62a01f60739906f7047e"
-  integrity sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==
+"@babel/helper-module-transforms@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
+  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
   dependencies:
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-module-imports" "^7.22.15"
@@ -211,36 +116,6 @@
     "@babel/helper-split-export-declaration" "^7.22.6"
     "@babel/helper-validator-identifier" "^7.22.20"
 
-"@babel/helper-optimise-call-expression@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
-  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
-  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
-
-"@babel/helper-remap-async-to-generator@^7.22.20", "@babel/helper-remap-async-to-generator@^7.22.5":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz#7b68e1cb4fa964d2996fd063723fb48eca8498e0"
-  integrity sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-wrap-function" "^7.22.20"
-
-"@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz#e37d367123ca98fe455a9887734ed2e16eb7a793"
-  integrity sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-member-expression-to-functions" "^7.22.15"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
-
 "@babel/helper-simple-access@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
@@ -248,13 +123,6 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
-  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
-  dependencies:
-    "@babel/types" "^7.22.5"
-
 "@babel/helper-split-export-declaration@^7.22.6":
   version "7.22.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
@@ -262,40 +130,31 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-string-parser@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
-  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+"@babel/helper-string-parser@^7.23.4":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e"
+  integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==
 
-"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.22.5":
+"@babel/helper-validator-identifier@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
   integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
 
-"@babel/helper-validator-option@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040"
-  integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==
+"@babel/helper-validator-option@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
+  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
 
-"@babel/helper-wrap-function@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz#15352b0b9bfb10fc9c76f79f6342c00e3411a569"
-  integrity sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==
+"@babel/helpers@^7.24.4":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.4.tgz#dc00907fd0d95da74563c142ef4cd21f2cb856b6"
+  integrity sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==
   dependencies:
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.22.19"
+    "@babel/template" "^7.24.0"
+    "@babel/traverse" "^7.24.1"
+    "@babel/types" "^7.24.0"
 
-"@babel/helpers@^7.22.6", "@babel/helpers@^7.23.0":
-  version "7.23.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.1.tgz#44e981e8ce2b9e99f8f0b703f3326a4636c16d15"
-  integrity sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==
-  dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.23.0"
-    "@babel/types" "^7.23.0"
-
-"@babel/highlight@^7.22.13", "@babel/highlight@^7.22.5":
+"@babel/highlight@^7.22.13":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
   integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
@@ -304,799 +163,206 @@
     chalk "^2.4.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.3":
-  version "7.22.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.7.tgz#df8cf085ce92ddbdbf668a7f186ce848c9036cae"
-  integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
-
-"@babel/parser@^7.22.15", "@babel/parser@^7.22.5", "@babel/parser@^7.22.7", "@babel/parser@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
-  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
+"@babel/highlight@^7.24.2":
+  version "7.24.2"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.2.tgz#3f539503efc83d3c59080a10e6634306e0370d26"
+  integrity sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
 "@babel/parser@^7.23.5":
   version "7.23.9"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b"
   integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz#02dc8a03f613ed5fdc29fb2f728397c78146c962"
-  integrity sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz#2aeb91d337d4e1a1e7ce85b76a37f5301781200f"
-  integrity sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-transform-optional-chaining" "^7.22.15"
-
-"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
-  version "7.21.0-placeholder-for-preset-env.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
-  integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
-
-"@babel/plugin-syntax-async-generators@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
-  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-bigint@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
-  integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
-  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-syntax-class-static-block@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
-  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-syntax-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
-  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-export-namespace-from@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
-  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-syntax-import-assertions@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98"
-  integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-syntax-import-attributes@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz#ab840248d834410b829f569f5262b9e517555ecb"
-  integrity sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-syntax-import-meta@^7.10.4", "@babel/plugin-syntax-import-meta@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
-  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
-  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-jsx@^7.7.2":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918"
-  integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
-  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
-  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
-  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-object-rest-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
-  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
-  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-optional-chaining@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
-  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
+"@babel/parser@^7.23.9", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1", "@babel/parser@^7.24.4":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88"
+  integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==
 
-"@babel/plugin-syntax-private-property-in-object@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
-  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
+"@babel/runtime-corejs3@^7.24.4":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.24.4.tgz#b9ebe728087cfbb22bbaccc6f9a70d69834124a0"
+  integrity sha512-VOQOexSilscN24VEY810G/PqtpFvx/z6UqDIjIWbDe2368HhDLkYN5TYwaEz/+eRCUkhJ2WaNLLmQAlxzfWj4w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
-  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-syntax-typescript@^7.7.2":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272"
-  integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    core-js-pure "^3.30.2"
+    regenerator-runtime "^0.14.0"
 
-"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
-  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
+"@babel/runtime@^7.12.5", "@babel/runtime@^7.21.0":
+  version "7.23.1"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.1.tgz#72741dc4d413338a91dcb044a86f3c0bc402646d"
+  integrity sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    regenerator-runtime "^0.14.0"
 
-"@babel/plugin-transform-arrow-functions@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958"
-  integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==
+"@babel/template@^7.22.15", "@babel/template@^7.24.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.0.tgz#c6a524aa93a4a05d66aaf31654258fae69d87d50"
+  integrity sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/parser" "^7.24.0"
+    "@babel/types" "^7.24.0"
 
-"@babel/plugin-transform-async-generator-functions@^7.23.2":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz#054afe290d64c6f576f371ccc321772c8ea87ebb"
-  integrity sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==
+"@babel/traverse@^7.24.1":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c"
+  integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==
   dependencies:
+    "@babel/code-frame" "^7.24.1"
+    "@babel/generator" "^7.24.1"
     "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.20"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-
-"@babel/plugin-transform-async-to-generator@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775"
-  integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-remap-async-to-generator" "^7.22.5"
-
-"@babel/plugin-transform-block-scoped-functions@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024"
-  integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-block-scoping@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz#8744d02c6c264d82e1a4bc5d2d501fd8aff6f022"
-  integrity sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-class-properties@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77"
-  integrity sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-class-static-block@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz#dc8cc6e498f55692ac6b4b89e56d87cec766c974"
-  integrity sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.11"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
-"@babel/plugin-transform-classes@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz#aaf4753aee262a232bbc95451b4bdf9599c65a0b"
-  integrity sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.9"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.24.1"
+    "@babel/types" "^7.24.0"
+    debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869"
-  integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/template" "^7.22.5"
-
-"@babel/plugin-transform-destructuring@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz#6447aa686be48b32eaf65a73e0e2c0bd010a266c"
-  integrity sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-dotall-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165"
-  integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-duplicate-keys@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285"
-  integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-dynamic-import@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz#2c7722d2a5c01839eaf31518c6ff96d408e447aa"
-  integrity sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
-"@babel/plugin-transform-exponentiation-operator@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a"
-  integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-export-namespace-from@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz#b3c84c8f19880b6c7440108f8929caf6056db26c"
-  integrity sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-
-"@babel/plugin-transform-for-of@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz#f64b4ccc3a4f131a996388fae7680b472b306b29"
-  integrity sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-function-name@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143"
-  integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-json-strings@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz#689a34e1eed1928a40954e37f74509f48af67835"
-  integrity sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-
-"@babel/plugin-transform-literals@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920"
-  integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-logical-assignment-operators@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz#24c522a61688bde045b7d9bc3c2597a4d948fc9c"
-  integrity sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-transform-member-expression-literals@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def"
-  integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-modules-amd@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz#05b2bc43373faa6d30ca89214731f76f966f3b88"
-  integrity sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.23.0"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-modules-commonjs@^7.2.0":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa"
-  integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
+"@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
+  integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
   dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-simple-access" "^7.22.5"
-
-"@babel/plugin-transform-modules-commonjs@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz#b3dba4757133b2762c00f4f94590cf6d52602481"
-  integrity sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.23.0"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-simple-access" "^7.22.5"
-
-"@babel/plugin-transform-modules-systemjs@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz#77591e126f3ff4132a40595a6cccd00a6b60d160"
-  integrity sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-module-transforms" "^7.23.0"
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-string-parser" "^7.23.4"
     "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
 
-"@babel/plugin-transform-modules-umd@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98"
-  integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
-  integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-new-target@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d"
-  integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-nullish-coalescing-operator@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz#debef6c8ba795f5ac67cd861a81b744c5d38d9fc"
-  integrity sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-
-"@babel/plugin-transform-numeric-separator@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz#498d77dc45a6c6db74bb829c02a01c1d719cbfbd"
-  integrity sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-transform-object-rest-spread@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz#21a95db166be59b91cde48775310c0df6e1da56f"
-  integrity sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==
-  dependencies:
-    "@babel/compat-data" "^7.22.9"
-    "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.22.15"
-
-"@babel/plugin-transform-object-super@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c"
-  integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.22.5"
-
-"@babel/plugin-transform-optional-catch-binding@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz#461cc4f578a127bb055527b3e77404cad38c08e0"
-  integrity sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-transform-optional-chaining@^7.22.15", "@babel/plugin-transform-optional-chaining@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz#73ff5fc1cf98f542f09f29c0631647d8ad0be158"
-  integrity sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-
-"@babel/plugin-transform-parameters@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz#719ca82a01d177af358df64a514d64c2e3edb114"
-  integrity sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-private-methods@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz#21c8af791f76674420a147ae62e9935d790f8722"
-  integrity sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-private-property-in-object@^7.22.11":
-  version "7.22.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz#ad45c4fc440e9cb84c718ed0906d96cf40f9a4e1"
-  integrity sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.22.11"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-
-"@babel/plugin-transform-property-literals@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766"
-  integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/plugin-transform-regenerator@^7.22.10":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz#8ceef3bd7375c4db7652878b0241b2be5d0c3cca"
-  integrity sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    regenerator-transform "^0.15.2"
-
-"@babel/plugin-transform-reserved-words@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb"
-  integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+"@esbuild/aix-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537"
+  integrity sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==
 
-"@babel/plugin-transform-runtime@^7.16.8":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.2.tgz#c956a3f8d1aa50816ff6c30c6288d66635c12990"
-  integrity sha512-XOntj6icgzMS58jPVtQpiuF6ZFWxQiJavISGx5KGjRj+3gqZr8+N6Kx+N9BApWzgS+DOjIZfXXj0ZesenOWDyA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    babel-plugin-polyfill-corejs2 "^0.4.6"
-    babel-plugin-polyfill-corejs3 "^0.8.5"
-    babel-plugin-polyfill-regenerator "^0.5.3"
-    semver "^6.3.1"
+"@esbuild/android-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz#db1c9202a5bc92ea04c7b6840f1bbe09ebf9e6b9"
+  integrity sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==
 
-"@babel/plugin-transform-shorthand-properties@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624"
-  integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+"@esbuild/android-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.2.tgz#3b488c49aee9d491c2c8f98a909b785870d6e995"
+  integrity sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==
 
-"@babel/plugin-transform-spread@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b"
-  integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+"@esbuild/android-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.2.tgz#3b1628029e5576249d2b2d766696e50768449f98"
+  integrity sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==
 
-"@babel/plugin-transform-sticky-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa"
-  integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+"@esbuild/darwin-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz#6e8517a045ddd86ae30c6608c8475ebc0c4000bb"
+  integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==
 
-"@babel/plugin-transform-template-literals@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff"
-  integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+"@esbuild/darwin-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0"
+  integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==
 
-"@babel/plugin-transform-typeof-symbol@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34"
-  integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+"@esbuild/freebsd-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz#d71502d1ee89a1130327e890364666c760a2a911"
+  integrity sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==
 
-"@babel/plugin-transform-unicode-escapes@^7.22.10":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz#c723f380f40a2b2f57a62df24c9005834c8616d9"
-  integrity sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+"@esbuild/freebsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz#aa5ea58d9c1dd9af688b8b6f63ef0d3d60cea53c"
+  integrity sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==
 
-"@babel/plugin-transform-unicode-property-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz#098898f74d5c1e86660dc112057b2d11227f1c81"
-  integrity sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
+"@esbuild/linux-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz#055b63725df678379b0f6db9d0fa85463755b2e5"
+  integrity sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==
 
-"@babel/plugin-transform-unicode-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183"
-  integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
+"@esbuild/linux-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz#76b3b98cb1f87936fbc37f073efabad49dcd889c"
+  integrity sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==
 
-"@babel/plugin-transform-unicode-sets-regex@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz#77788060e511b708ffc7d42fdfbc5b37c3004e91"
-  integrity sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.22.5"
-
-"@babel/preset-env@^7.16.8":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.2.tgz#1f22be0ff0e121113260337dbc3e58fafce8d059"
-  integrity sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==
-  dependencies:
-    "@babel/compat-data" "^7.23.2"
-    "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-plugin-utils" "^7.22.5"
-    "@babel/helper-validator-option" "^7.22.15"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.15"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.15"
-    "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-class-properties" "^7.12.13"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.22.5"
-    "@babel/plugin-syntax-import-attributes" "^7.22.5"
-    "@babel/plugin-syntax-import-meta" "^7.10.4"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-    "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
-    "@babel/plugin-transform-arrow-functions" "^7.22.5"
-    "@babel/plugin-transform-async-generator-functions" "^7.23.2"
-    "@babel/plugin-transform-async-to-generator" "^7.22.5"
-    "@babel/plugin-transform-block-scoped-functions" "^7.22.5"
-    "@babel/plugin-transform-block-scoping" "^7.23.0"
-    "@babel/plugin-transform-class-properties" "^7.22.5"
-    "@babel/plugin-transform-class-static-block" "^7.22.11"
-    "@babel/plugin-transform-classes" "^7.22.15"
-    "@babel/plugin-transform-computed-properties" "^7.22.5"
-    "@babel/plugin-transform-destructuring" "^7.23.0"
-    "@babel/plugin-transform-dotall-regex" "^7.22.5"
-    "@babel/plugin-transform-duplicate-keys" "^7.22.5"
-    "@babel/plugin-transform-dynamic-import" "^7.22.11"
-    "@babel/plugin-transform-exponentiation-operator" "^7.22.5"
-    "@babel/plugin-transform-export-namespace-from" "^7.22.11"
-    "@babel/plugin-transform-for-of" "^7.22.15"
-    "@babel/plugin-transform-function-name" "^7.22.5"
-    "@babel/plugin-transform-json-strings" "^7.22.11"
-    "@babel/plugin-transform-literals" "^7.22.5"
-    "@babel/plugin-transform-logical-assignment-operators" "^7.22.11"
-    "@babel/plugin-transform-member-expression-literals" "^7.22.5"
-    "@babel/plugin-transform-modules-amd" "^7.23.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.23.0"
-    "@babel/plugin-transform-modules-systemjs" "^7.23.0"
-    "@babel/plugin-transform-modules-umd" "^7.22.5"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
-    "@babel/plugin-transform-new-target" "^7.22.5"
-    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.11"
-    "@babel/plugin-transform-numeric-separator" "^7.22.11"
-    "@babel/plugin-transform-object-rest-spread" "^7.22.15"
-    "@babel/plugin-transform-object-super" "^7.22.5"
-    "@babel/plugin-transform-optional-catch-binding" "^7.22.11"
-    "@babel/plugin-transform-optional-chaining" "^7.23.0"
-    "@babel/plugin-transform-parameters" "^7.22.15"
-    "@babel/plugin-transform-private-methods" "^7.22.5"
-    "@babel/plugin-transform-private-property-in-object" "^7.22.11"
-    "@babel/plugin-transform-property-literals" "^7.22.5"
-    "@babel/plugin-transform-regenerator" "^7.22.10"
-    "@babel/plugin-transform-reserved-words" "^7.22.5"
-    "@babel/plugin-transform-shorthand-properties" "^7.22.5"
-    "@babel/plugin-transform-spread" "^7.22.5"
-    "@babel/plugin-transform-sticky-regex" "^7.22.5"
-    "@babel/plugin-transform-template-literals" "^7.22.5"
-    "@babel/plugin-transform-typeof-symbol" "^7.22.5"
-    "@babel/plugin-transform-unicode-escapes" "^7.22.10"
-    "@babel/plugin-transform-unicode-property-regex" "^7.22.5"
-    "@babel/plugin-transform-unicode-regex" "^7.22.5"
-    "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
-    "@babel/preset-modules" "0.1.6-no-external-plugins"
-    "@babel/types" "^7.23.0"
-    babel-plugin-polyfill-corejs2 "^0.4.6"
-    babel-plugin-polyfill-corejs3 "^0.8.5"
-    babel-plugin-polyfill-regenerator "^0.5.3"
-    core-js-compat "^3.31.0"
-    semver "^6.3.1"
+"@esbuild/linux-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz#c0e5e787c285264e5dfc7a79f04b8b4eefdad7fa"
+  integrity sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==
 
-"@babel/preset-modules@0.1.6-no-external-plugins":
-  version "0.1.6-no-external-plugins"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a"
-  integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/types" "^7.4.4"
-    esutils "^2.0.2"
+"@esbuild/linux-loong64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz#a6184e62bd7cdc63e0c0448b83801001653219c5"
+  integrity sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==
 
-"@babel/regjsgen@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
-  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
+"@esbuild/linux-mips64el@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz#d08e39ce86f45ef8fc88549d29c62b8acf5649aa"
+  integrity sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==
 
-"@babel/runtime-corejs3@^7.16.8":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.23.2.tgz#a5cd9d8b408fb946b2f074b21ea40c04e516795c"
-  integrity sha512-54cIh74Z1rp4oIjsHjqN+WM4fMyCBYe+LpZ9jWm51CZ1fbH3SkAzQD/3XLoNkjbJ7YEmjobLXyvQrFypRHOrXw==
-  dependencies:
-    core-js-pure "^3.30.2"
-    regenerator-runtime "^0.14.0"
+"@esbuild/linux-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz#8d252f0b7756ffd6d1cbde5ea67ff8fd20437f20"
+  integrity sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==
 
-"@babel/runtime@^7.12.5", "@babel/runtime@^7.21.0":
-  version "7.23.1"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.1.tgz#72741dc4d413338a91dcb044a86f3c0bc402646d"
-  integrity sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g==
-  dependencies:
-    regenerator-runtime "^0.14.0"
+"@esbuild/linux-riscv64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz#19f6dcdb14409dae607f66ca1181dd4e9db81300"
+  integrity sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==
 
-"@babel/runtime@^7.8.4":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
-  integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
-  dependencies:
-    regenerator-runtime "^0.14.0"
+"@esbuild/linux-s390x@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz#3c830c90f1a5d7dd1473d5595ea4ebb920988685"
+  integrity sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==
 
-"@babel/template@^7.22.15", "@babel/template@^7.22.5":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
-  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
-  dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/parser" "^7.22.15"
-    "@babel/types" "^7.22.15"
+"@esbuild/linux-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz#86eca35203afc0d9de0694c64ec0ab0a378f6fff"
+  integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==
 
-"@babel/template@^7.3.3":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
-  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
-  dependencies:
-    "@babel/code-frame" "^7.22.5"
-    "@babel/parser" "^7.22.5"
-    "@babel/types" "^7.22.5"
+"@esbuild/netbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz#e771c8eb0e0f6e1877ffd4220036b98aed5915e6"
+  integrity sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==
 
-"@babel/traverse@^7.22.8", "@babel/traverse@^7.23.0":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
-  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
-  dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.0"
-    "@babel/types" "^7.23.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
+"@esbuild/openbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz#9a795ae4b4e37e674f0f4d716f3e226dd7c39baf"
+  integrity sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==
 
-"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.3.3":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
-  integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
-  dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.5"
-    to-fast-properties "^2.0.0"
+"@esbuild/sunos-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz#7df23b61a497b8ac189def6e25a95673caedb03f"
+  integrity sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==
 
-"@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.4.4":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
-  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
-  dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.20"
-    to-fast-properties "^2.0.0"
+"@esbuild/win32-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz#f1ae5abf9ca052ae11c1bc806fb4c0f519bacf90"
+  integrity sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==
 
-"@bcoe/v8-coverage@^0.2.3":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
-  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
+"@esbuild/win32-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz#241fe62c34d8e8461cd708277813e1d0ba55ce23"
+  integrity sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==
 
-"@discoveryjs/json-ext@0.5.7", "@discoveryjs/json-ext@^0.5.0":
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
-  integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
+"@esbuild/win32-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc"
+  integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==
 
-"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.3.0":
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
   integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.4.0":
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.1.tgz#cdd35dce4fa1a89a4fd42b1599eb35b3af408884"
-  integrity sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
+  integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
 
-"@eslint/eslintrc@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.0.tgz#82256f164cc9e0b59669efc19d57f8092706841d"
-  integrity sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -1108,10 +374,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.44.0":
-  version "8.44.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.44.0.tgz#961a5903c74139390478bdc808bcde3fc45ab7af"
-  integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==
+"@eslint/js@8.57.0":
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
+  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
 "@foliojs-fork/fontkit@^1.9.1":
   version "1.9.1"
@@ -1153,18 +419,18 @@
   resolved "https://registry.yarnpkg.com/@foliojs-fork/restructure/-/restructure-2.0.2.tgz#73759aba2aff1da87b7c4554e6839c70d43c92b4"
   integrity sha512-59SgoZ3EXbkfSX7b63tsou/SDGzwUEK6MuB5sKqgVK1/XE0fxmpsOb9DQI8LXW3KfGnAjImCGhhEb7uPPAUVNA==
 
-"@fortawesome/fontawesome-free@^5.12.1", "@fortawesome/fontawesome-free@^5.15.4":
+"@fortawesome/fontawesome-free@^5.15.4":
   version "5.15.4"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5"
   integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==
 
-"@humanwhocodes/config-array@^0.11.10":
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
-  integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
+"@humanwhocodes/config-array@^0.11.14":
+  version "0.11.14"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
+  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.1"
-    debug "^4.1.1"
+    "@humanwhocodes/object-schema" "^2.0.2"
+    debug "^4.3.1"
     minimatch "^3.0.5"
 
 "@humanwhocodes/module-importer@^1.0.1":
@@ -1172,172 +438,16 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
-
-"@istanbuljs/load-nyc-config@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
-  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
-  dependencies:
-    camelcase "^5.3.1"
-    find-up "^4.1.0"
-    get-package-type "^0.1.0"
-    js-yaml "^3.13.1"
-    resolve-from "^5.0.0"
+"@humanwhocodes/object-schema@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
-"@istanbuljs/schema@^0.1.2":
+"@istanbuljs/schema@^0.1.2", "@istanbuljs/schema@^0.1.3":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/console@^29.6.1":
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.6.1.tgz#b48ba7b9c34b51483e6d590f46e5837f1ab5f639"
-  integrity sha512-Aj772AYgwTSr5w8qnyoJ0eDYvN6bMsH3ORH1ivMotrInHLKdUz6BDlaEXHdM6kODaBIkNIyQGzsMvRdOv7VG7Q==
-  dependencies:
-    "@jest/types" "^29.6.1"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    jest-message-util "^29.6.1"
-    jest-util "^29.6.1"
-    slash "^3.0.0"
-
-"@jest/core@^29.6.1":
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.6.1.tgz#fac0d9ddf320490c93356ba201451825231e95f6"
-  integrity sha512-CcowHypRSm5oYQ1obz1wfvkjZZ2qoQlrKKvlfPwh5jUXVU12TWr2qMeH8chLMuTFzHh5a1g2yaqlqDICbr+ukQ==
-  dependencies:
-    "@jest/console" "^29.6.1"
-    "@jest/reporters" "^29.6.1"
-    "@jest/test-result" "^29.6.1"
-    "@jest/transform" "^29.6.1"
-    "@jest/types" "^29.6.1"
-    "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.9"
-    jest-changed-files "^29.5.0"
-    jest-config "^29.6.1"
-    jest-haste-map "^29.6.1"
-    jest-message-util "^29.6.1"
-    jest-regex-util "^29.4.3"
-    jest-resolve "^29.6.1"
-    jest-resolve-dependencies "^29.6.1"
-    jest-runner "^29.6.1"
-    jest-runtime "^29.6.1"
-    jest-snapshot "^29.6.1"
-    jest-util "^29.6.1"
-    jest-validate "^29.6.1"
-    jest-watcher "^29.6.1"
-    micromatch "^4.0.4"
-    pretty-format "^29.6.1"
-    slash "^3.0.0"
-    strip-ansi "^6.0.0"
-
-"@jest/environment@^29.6.1":
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.6.1.tgz#ee358fff2f68168394b4a50f18c68278a21fe82f"
-  integrity sha512-RMMXx4ws+Gbvw3DfLSuo2cfQlK7IwGbpuEWXCqyYDcqYTI+9Ju3a5hDnXaxjNsa6uKh9PQF2v+qg+RLe63tz5A==
-  dependencies:
-    "@jest/fake-timers" "^29.6.1"
-    "@jest/types" "^29.6.1"
-    "@types/node" "*"
-    jest-mock "^29.6.1"
-
-"@jest/environment@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7"
-  integrity sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==
-  dependencies:
-    "@jest/fake-timers" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    "@types/node" "*"
-    jest-mock "^29.7.0"
-
-"@jest/expect-utils@^29.6.1", "@jest/expect-utils@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6"
-  integrity sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==
-  dependencies:
-    jest-get-type "^29.6.3"
-
-"@jest/expect@^29.6.1":
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.6.1.tgz#fef18265188f6a97601f1ea0a2912d81a85b4657"
-  integrity sha512-N5xlPrAYaRNyFgVf2s9Uyyvr795jnB6rObuPx4QFvNJz8aAjpZUDfO4bh5G/xuplMID8PrnuF1+SfSyDxhsgYg==
-  dependencies:
-    expect "^29.6.1"
-    jest-snapshot "^29.6.1"
-
-"@jest/fake-timers@^29.6.1":
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.6.1.tgz#c773efddbc61e1d2efcccac008139f621de57c69"
-  integrity sha512-RdgHgbXyosCDMVYmj7lLpUwXA4c69vcNzhrt69dJJdf8azUrpRh3ckFCaTPNjsEeRi27Cig0oKDGxy5j7hOgHg==
-  dependencies:
-    "@jest/types" "^29.6.1"
-    "@sinonjs/fake-timers" "^10.0.2"
-    "@types/node" "*"
-    jest-message-util "^29.6.1"
-    jest-mock "^29.6.1"
-    jest-util "^29.6.1"
-
-"@jest/fake-timers@^29.7.0":
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.7.0.tgz#fd91bf1fffb16d7d0d24a426ab1a47a49881a565"
-  integrity sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==
-  dependencies:
-    "@jest/types" "^29.6.3"
-    "@sinonjs/fake-timers" "^10.0.2"
-    "@types/node" "*"
-    jest-message-util "^29.7.0"
-    jest-mock "^29.7.0"
-    jest-util "^29.7.0"
-
-"@jest/globals@^29.6.1":
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.6.1.tgz#c8a8923e05efd757308082cc22893d82b8aa138f"
-  integrity sha512-2VjpaGy78JY9n9370H8zGRCFbYVWwjY6RdDMhoJHa1sYfwe6XM/azGN0SjY8kk7BOZApIejQ1BFPyH7FPG0w3A==
-  dependencies:
-    "@jest/environment" "^29.6.1"
-    "@jest/expect" "^29.6.1"
-    "@jest/types" "^29.6.1"
-    jest-mock "^29.6.1"
-
-"@jest/reporters@^29.6.1":
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.6.1.tgz#3325a89c9ead3cf97ad93df3a427549d16179863"
-  integrity sha512-9zuaI9QKr9JnoZtFQlw4GREQbxgmNYXU6QuWtmuODvk5nvPUeBYapVR/VYMyi2WSx3jXTLJTJji8rN6+Cm4+FA==
-  dependencies:
-    "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^29.6.1"
-    "@jest/test-result" "^29.6.1"
-    "@jest/transform" "^29.6.1"
-    "@jest/types" "^29.6.1"
-    "@jridgewell/trace-mapping" "^0.3.18"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^5.1.0"
-    istanbul-lib-report "^3.0.0"
-    istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.1.3"
-    jest-message-util "^29.6.1"
-    jest-util "^29.6.1"
-    jest-worker "^29.6.1"
-    slash "^3.0.0"
-    string-length "^4.0.1"
-    strip-ansi "^6.0.0"
-    v8-to-istanbul "^9.0.1"
-
 "@jest/schemas@^29.6.3":
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
@@ -1345,122 +455,34 @@
   dependencies:
     "@sinclair/typebox" "^0.27.8"
 
-"@jest/source-map@^29.6.0":
-  version "29.6.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.6.0.tgz#bd34a05b5737cb1a99d43e1957020ac8e5b9ddb1"
-  integrity sha512-oA+I2SHHQGxDCZpbrsCQSoMLb3Bz547JnM+jUr9qEbuw0vQlWZfpPS7CO9J7XiwKicEz9OFn/IYoLkkiUD7bzA==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.18"
-    callsites "^3.0.0"
-    graceful-fs "^4.2.9"
-
-"@jest/test-result@^29.6.1":
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.6.1.tgz#850e565a3f58ee8ca6ec424db00cb0f2d83c36ba"
-  integrity sha512-Ynr13ZRcpX6INak0TPUukU8GWRfm/vAytE3JbJNGAvINySWYdfE7dGZMbk36oVuK4CigpbhMn8eg1dixZ7ZJOw==
-  dependencies:
-    "@jest/console" "^29.6.1"
-    "@jest/types" "^29.6.1"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    collect-v8-coverage "^1.0.0"
-
-"@jest/test-sequencer@^29.6.1":
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.6.1.tgz#e3e582ee074dd24ea9687d7d1aaf05ee3a9b068e"
-  integrity sha512-oBkC36PCDf/wb6dWeQIhaviU0l5u6VCsXa119yqdUosYAt7/FbQU2M2UoziO3igj/HBDEgp57ONQ3fm0v9uyyg==
-  dependencies:
-    "@jest/test-result" "^29.6.1"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^29.6.1"
-    slash "^3.0.0"
-
-"@jest/transform@^29.6.1":
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.6.1.tgz#acb5606019a197cb99beda3c05404b851f441c92"
-  integrity sha512-URnTneIU3ZjRSaf906cvf6Hpox3hIeJXRnz3VDSw5/X93gR8ycdfSIEy19FlVx8NFmpN7fe3Gb1xF+NjXaQLWg==
-  dependencies:
-    "@babel/core" "^7.11.6"
-    "@jest/types" "^29.6.1"
-    "@jridgewell/trace-mapping" "^0.3.18"
-    babel-plugin-istanbul "^6.1.1"
-    chalk "^4.0.0"
-    convert-source-map "^2.0.0"
-    fast-json-stable-stringify "^2.1.0"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^29.6.1"
-    jest-regex-util "^29.4.3"
-    jest-util "^29.6.1"
-    micromatch "^4.0.4"
-    pirates "^4.0.4"
-    slash "^3.0.0"
-    write-file-atomic "^4.0.2"
-
-"@jest/types@^29.6.1", "@jest/types@^29.6.3":
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
-  integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
-  dependencies:
-    "@jest/schemas" "^29.6.3"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^17.0.8"
-    chalk "^4.0.0"
-
-"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
-  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
+"@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
+  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
   dependencies:
-    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/set-array" "^1.2.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.9"
-
-"@jridgewell/resolve-uri@3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
-  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+    "@jridgewell/trace-mapping" "^0.3.24"
 
 "@jridgewell/resolve-uri@^3.1.0":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
-  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
-
-"@jridgewell/set-array@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
-  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
-
-"@jridgewell/source-map@^0.3.3":
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91"
-  integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==
-  dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
 
-"@jridgewell/sourcemap-codec@1.4.14":
-  version "1.4.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
-  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+"@jridgewell/set-array@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
+  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
 
-"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15":
   version "1.4.15"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18":
-  version "0.3.18"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
-  integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
-  dependencies:
-    "@jridgewell/resolve-uri" "3.1.0"
-    "@jridgewell/sourcemap-codec" "1.4.14"
-
-"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.19"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811"
-  integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==
+"@jridgewell/trace-mapping@^0.3.23", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+  version "0.3.25"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
   dependencies:
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
@@ -1470,12 +492,48 @@
   resolved "https://registry.yarnpkg.com/@lgaitan/pace-progress/-/pace-progress-1.0.7.tgz#c96fbbd9fd4cf528feed34ea0c8f9d8b3e98f0dd"
   integrity sha1-yW+72f1M9Sj+7TTqDI+diz6Y8N0=
 
-"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
-  version "5.1.1-v1"
-  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
-  integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
+"@microsoft/api-extractor-model@7.28.13":
+  version "7.28.13"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.28.13.tgz#96fbc52155e0d07e0eabbd9699065b77702fe33a"
+  integrity sha512-39v/JyldX4MS9uzHcdfmjjfS6cYGAoXV+io8B5a338pkHiSt+gy2eXQ0Q7cGFJ7quSa1VqqlMdlPrB6sLR/cAw==
+  dependencies:
+    "@microsoft/tsdoc" "0.14.2"
+    "@microsoft/tsdoc-config" "~0.16.1"
+    "@rushstack/node-core-library" "4.0.2"
+
+"@microsoft/api-extractor@7.43.0":
+  version "7.43.0"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.43.0.tgz#41c42677bc71cd8e0f23c63c56802d85044e65cd"
+  integrity sha512-GFhTcJpB+MI6FhvXEI9b2K0snulNLWHqC/BbcJtyNYcKUiw7l3Lgis5ApsYncJ0leALX7/of4XfmXk+maT111w==
+  dependencies:
+    "@microsoft/api-extractor-model" "7.28.13"
+    "@microsoft/tsdoc" "0.14.2"
+    "@microsoft/tsdoc-config" "~0.16.1"
+    "@rushstack/node-core-library" "4.0.2"
+    "@rushstack/rig-package" "0.5.2"
+    "@rushstack/terminal" "0.10.0"
+    "@rushstack/ts-command-line" "4.19.1"
+    lodash "~4.17.15"
+    minimatch "~3.0.3"
+    resolve "~1.22.1"
+    semver "~7.5.4"
+    source-map "~0.6.1"
+    typescript "5.4.2"
+
+"@microsoft/tsdoc-config@~0.16.1":
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc-config/-/tsdoc-config-0.16.2.tgz#b786bb4ead00d54f53839a458ce626c8548d3adf"
+  integrity sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==
   dependencies:
-    eslint-scope "5.1.1"
+    "@microsoft/tsdoc" "0.14.2"
+    ajv "~6.12.6"
+    jju "~1.4.0"
+    resolve "~1.19.0"
+
+"@microsoft/tsdoc@0.14.2":
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.14.2.tgz#c3ec604a0b54b9a9b87e9735dfc59e1a5da6a5fb"
+  integrity sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -1498,11 +556,6 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@polka/url@^1.0.0-next.20":
-  version "1.0.0-next.23"
-  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.23.tgz#498e41218ab3b6a1419c735e5c6ae2c5ed609b6c"
-  integrity sha512-C16M+IYz0rgRhWZdCmK+h58JMv8vijAA61gmz2rspCSwKwzBebpdcsiUmwrtJRdphuY30i6BSLEOP8ppbNLyLg==
-
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
@@ -1556,55 +609,152 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
 
+"@rollup/pluginutils@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.0.tgz#7e53eddc8c7f483a4ad0b94afb1f7f5fd3c771e0"
+  integrity sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    estree-walker "^2.0.2"
+    picomatch "^2.3.1"
+
+"@rollup/rollup-android-arm-eabi@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.14.3.tgz#bddf05c3387d02fac04b6b86b3a779337edfed75"
+  integrity sha512-X9alQ3XM6I9IlSlmC8ddAvMSyG1WuHk5oUnXGw+yUBs3BFoTizmG1La/Gr8fVJvDWAq+zlYTZ9DBgrlKRVY06g==
+
+"@rollup/rollup-android-arm64@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.14.3.tgz#b26bd09de58704c0a45e3375b76796f6eda825e4"
+  integrity sha512-eQK5JIi+POhFpzk+LnjKIy4Ks+pwJ+NXmPxOCSvOKSNRPONzKuUvWE+P9JxGZVxrtzm6BAYMaL50FFuPe0oWMQ==
+
+"@rollup/rollup-darwin-arm64@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.14.3.tgz#c5f3fd1aa285b6d33dda6e3f3ca395f8c37fd5ca"
+  integrity sha512-Od4vE6f6CTT53yM1jgcLqNfItTsLt5zE46fdPaEmeFHvPs5SjZYlLpHrSiHEKR1+HdRfxuzXHjDOIxQyC3ptBA==
+
+"@rollup/rollup-darwin-x64@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.3.tgz#8e4673734d7dc9d68f6d48e81246055cda0e840f"
+  integrity sha512-0IMAO21axJeNIrvS9lSe/PGthc8ZUS+zC53O0VhF5gMxfmcKAP4ESkKOCwEi6u2asUrt4mQv2rjY8QseIEb1aw==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.14.3.tgz#53ed38eb13b58ababdb55a7f66f0538a7f85dcba"
+  integrity sha512-ge2DC7tHRHa3caVEoSbPRJpq7azhG+xYsd6u2MEnJ6XzPSzQsTKyXvh6iWjXRf7Rt9ykIUWHtl0Uz3T6yXPpKw==
+
+"@rollup/rollup-linux-arm-musleabihf@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.14.3.tgz#0706ee38330e267a5c9326956820f009cfb21fcd"
+  integrity sha512-ljcuiDI4V3ySuc7eSk4lQ9wU8J8r8KrOUvB2U+TtK0TiW6OFDmJ+DdIjjwZHIw9CNxzbmXY39wwpzYuFDwNXuw==
+
+"@rollup/rollup-linux-arm64-gnu@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.14.3.tgz#426fce7b8b242ac5abd48a10a5020f5a468c6cb4"
+  integrity sha512-Eci2us9VTHm1eSyn5/eEpaC7eP/mp5n46gTRB3Aar3BgSvDQGJZuicyq6TsH4HngNBgVqC5sDYxOzTExSU+NjA==
+
+"@rollup/rollup-linux-arm64-musl@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.14.3.tgz#65bf944530d759b50d7ffd00dfbdf4125a43406f"
+  integrity sha512-UrBoMLCq4E92/LCqlh+blpqMz5h1tJttPIniwUgOFJyjWI1qrtrDhhpHPuFxULlUmjFHfloWdixtDhSxJt5iKw==
+
+"@rollup/rollup-linux-powerpc64le-gnu@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.14.3.tgz#494ba3b31095e9a45df9c3f646d21400fb631a95"
+  integrity sha512-5aRjvsS8q1nWN8AoRfrq5+9IflC3P1leMoy4r2WjXyFqf3qcqsxRCfxtZIV58tCxd+Yv7WELPcO9mY9aeQyAmw==
+
+"@rollup/rollup-linux-riscv64-gnu@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.14.3.tgz#8b88ed0a40724cce04aa15374ebe5ba4092d679f"
+  integrity sha512-sk/Qh1j2/RJSX7FhEpJn8n0ndxy/uf0kI/9Zc4b1ELhqULVdTfN6HL31CDaTChiBAOgLcsJ1sgVZjWv8XNEsAQ==
+
+"@rollup/rollup-linux-s390x-gnu@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.14.3.tgz#09c9e5ec57a0f6ec3551272c860bb9a04b96d70f"
+  integrity sha512-jOO/PEaDitOmY9TgkxF/TQIjXySQe5KVYB57H/8LRP/ux0ZoO8cSHCX17asMSv3ruwslXW/TLBcxyaUzGRHcqg==
+
+"@rollup/rollup-linux-x64-gnu@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.14.3.tgz#197f27fd481ad9c861021d5cbbf21793922a631c"
+  integrity sha512-8ybV4Xjy59xLMyWo3GCfEGqtKV5M5gCSrZlxkPGvEPCGDLNla7v48S662HSGwRd6/2cSneMQWiv+QzcttLrrOA==
+
+"@rollup/rollup-linux-x64-musl@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.14.3.tgz#5cc0522f4942f2df625e9bfb6fb02c6580ffbce6"
+  integrity sha512-s+xf1I46trOY10OqAtZ5Rm6lzHre/UiLA1J2uOhCFXWkbZrJRkYBPO6FhvGfHmdtQ3Bx793MNa7LvoWFAm93bg==
+
+"@rollup/rollup-win32-arm64-msvc@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.14.3.tgz#a648122389d23a7543b261fba082e65fefefe4f6"
+  integrity sha512-+4h2WrGOYsOumDQ5S2sYNyhVfrue+9tc9XcLWLh+Kw3UOxAvrfOrSMFon60KspcDdytkNDh7K2Vs6eMaYImAZg==
+
+"@rollup/rollup-win32-ia32-msvc@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.14.3.tgz#34727b5c7953c35fc6e1ae4f770ad3a2025f8e03"
+  integrity sha512-T1l7y/bCeL/kUwh9OD4PQT4aM7Bq43vX05htPJJ46RTI4r5KNt6qJRzAfNfM+OYMNEVBWQzR2Gyk+FXLZfogGw==
+
+"@rollup/rollup-win32-x64-msvc@4.14.3":
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.3.tgz#5b2fb4d8cd44c05deef8a7b0e6deb9ccb8939d18"
+  integrity sha512-/BypzV0H1y1HzgYpxqRaXGBRqfodgoBBCcsrujT6QRcakDQdfU+Lq9PENPh5jB4I44YWq+0C2eHsHya+nZY1sA==
+
+"@rushstack/eslint-patch@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.10.2.tgz#053f1540703faa81dea2966b768ee5581c66aeda"
+  integrity sha512-hw437iINopmQuxWPSUEvqE56NCPsiU8N4AYtfHmJFckclktzK9YQJieD3XkDCDH4OjL+C7zgPUh73R/nrcHrqw==
+
+"@rushstack/node-core-library@4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-4.0.2.tgz#e26854a3314b279d57e8abdb4acce7797d02f554"
+  integrity sha512-hyES82QVpkfQMeBMteQUnrhASL/KHPhd7iJ8euduwNJG4mu2GSOKybf0rOEjOm1Wz7CwJEUm9y0yD7jg2C1bfg==
+  dependencies:
+    fs-extra "~7.0.1"
+    import-lazy "~4.0.0"
+    jju "~1.4.0"
+    resolve "~1.22.1"
+    semver "~7.5.4"
+    z-schema "~5.0.2"
+
+"@rushstack/rig-package@0.5.2":
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.5.2.tgz#0e23a115904678717a74049661931c0b37dd5495"
+  integrity sha512-mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA==
+  dependencies:
+    resolve "~1.22.1"
+    strip-json-comments "~3.1.1"
+
+"@rushstack/terminal@0.10.0":
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/@rushstack/terminal/-/terminal-0.10.0.tgz#e81909fa0e5c8016b6df4739f0f381f44358269f"
+  integrity sha512-UbELbXnUdc7EKwfH2sb8ChqNgapUOdqcCIdQP4NGxBpTZV2sQyeekuK3zmfQSa/MN+/7b4kBogl2wq0vpkpYGw==
+  dependencies:
+    "@rushstack/node-core-library" "4.0.2"
+    supports-color "~8.1.1"
+
+"@rushstack/ts-command-line@4.19.1":
+  version "4.19.1"
+  resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.19.1.tgz#288ee54dd607e558a8be07705869c16c31b5c3ef"
+  integrity sha512-J7H768dgcpG60d7skZ5uSSwyCZs/S2HrWP1Ds8d1qYAyaaeJmpmmLr9BVw97RjFzmQPOYnoXcKA4GkqDCkduQg==
+  dependencies:
+    "@rushstack/terminal" "0.10.0"
+    "@types/argparse" "1.0.38"
+    argparse "~1.0.9"
+    string-argv "~0.3.1"
+
 "@sinclair/typebox@^0.27.8":
   version "0.27.8"
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
   integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
 
-"@sinonjs/commons@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72"
-  integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==
-  dependencies:
-    type-detect "4.0.8"
-
-"@sinonjs/fake-timers@^10.0.2":
-  version "10.3.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66"
-  integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==
-  dependencies:
-    "@sinonjs/commons" "^3.0.0"
-
-"@splidejs/splide-extension-video@^0.4.6":
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/@splidejs/splide-extension-video/-/splide-extension-video-0.4.6.tgz#fe832e0a2f87a56896e800aead73e6ef78f2cb96"
-  integrity sha512-UEqxkuYClYDhV+DsX9384wKj6FWwWN3HUvUXcNPVKZiHvh0Zn0t1M2w/hcDRJ3VtCxFhx92Kgzlkf22HqdyF+g==
-  dependencies:
-    "@vimeo/player" "^2.10.0"
-
-"@splidejs/splide@^2.4.13":
-  version "2.4.21"
-  resolved "https://registry.yarnpkg.com/@splidejs/splide/-/splide-2.4.21.tgz#ad1954d8d8822c9bfea0d3dc6a119358b88581ad"
-  integrity sha512-LdIwSnmNsGybCCnA3QG2dOeRv/rQl46jf7FflXxMGX0ADYWyL6UJHWJbMZvHBi5I67uRJY1ga/W+CvJ39nH26A==
-
-"@splidejs/vue-splide@^0.3.5":
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/@splidejs/vue-splide/-/vue-splide-0.3.5.tgz#375d3c615fd88c612f46b8029b4ad2007ad6991b"
-  integrity sha512-eI4Kl2v+yAGKMVa9MtfIIPPZtplTfKPx4rCJlZqfethl3tCOGQwL9MxSyLk6bUhl31aOuClxmXQv8O5ubU8fNQ==
-  dependencies:
-    "@splidejs/splide" "^2.4.13"
-    "@splidejs/splide-extension-video" "^0.4.6"
-    vue "^2.6.12"
-
 "@sweetalert2/theme-bootstrap-4@^4.0.5":
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/@sweetalert2/theme-bootstrap-4/-/theme-bootstrap-4-4.0.5.tgz#488eac0a85e7601a42dc8b1d95ec8fc73ff330aa"
   integrity sha512-pe5mQ98sgrphNVq6Xe5BsWxsfI1Z8zT9C2oux6+4B6Qt30qYo58Q+bnzRs8pV95O9/URt/QJZyl+R8SabMeW6g==
 
-"@testing-library/dom@^9.0.1":
-  version "9.3.3"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-9.3.3.tgz#108c23a5b0ef51121c26ae92eb3179416b0434f5"
-  integrity sha512-fB0R+fa3AUqbLHWyxXa2kGVtf1Fe1ZZFr0Zp6AIbIAzXb2mKbEXl+PCQNUOaq5lbTab5tfctfXRNsWXxa2f7Aw==
+"@testing-library/dom@^9.3.4":
+  version "9.3.4"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-9.3.4.tgz#50696ec28376926fec0a1bf87d9dbac5e27f60ce"
+  integrity sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/runtime" "^7.12.5"
@@ -1615,10 +765,10 @@
     lz-string "^1.5.0"
     pretty-format "^27.0.2"
 
-"@testing-library/user-event@^14.4.3":
-  version "14.5.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.5.1.tgz#27337d72046d5236b32fd977edee3f74c71d332f"
-  integrity sha512-UCcUKrUYGj7ClomOo2SpNVvx4/fkd/2BbIHDCle8A0ax+P3bU7yJwDBDrS6ZwdTMARWTGODX1hEsCcO+7beJjg==
+"@testing-library/user-event@^14.5.2":
+  version "14.5.2"
+  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.5.2.tgz#db7257d727c891905947bd1c1a99da20e03c2ebd"
+  integrity sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ==
 
 "@toast-ui/editor@^3.2.2":
   version "3.2.2"
@@ -1641,54 +791,21 @@
   dependencies:
     "@toast-ui/editor" "^3.2.2"
 
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
 "@ttskch/select2-bootstrap4-theme@^1.5.2":
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/@ttskch/select2-bootstrap4-theme/-/select2-bootstrap4-theme-1.5.2.tgz#3b4519b349f3e7831c28752a1e9617312a192656"
   integrity sha512-gAj8qNy/VYwQDBkACm0USM66kxFai8flX83ayRXPNhzZckEgSqIBB9sM74SCM3ssgeX+ZVy4BifTnLis+KpIyg==
 
+"@types/argparse@1.0.38":
+  version "1.0.38"
+  resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.38.tgz#a81fd8606d481f873a3800c6ebae4f1d768a56a9"
+  integrity sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==
+
 "@types/aria-query@^5.0.1":
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.2.tgz#6f1225829d89794fd9f891989c9ce667422d7f64"
   integrity sha512-PHKZuMN+K5qgKIWhBodXzQslTo5P+K/6LqeKXS6O/4liIDdZqaX5RXrCK++LAw+y/nptN48YmUMFiQHRSWYwtQ==
 
-"@types/babel__core@^7.1.14":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.1.tgz#916ecea274b0c776fec721e333e55762d3a9614b"
-  integrity sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==
-  dependencies:
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
-    "@types/babel__generator" "*"
-    "@types/babel__template" "*"
-    "@types/babel__traverse" "*"
-
-"@types/babel__generator@*":
-  version "7.6.4"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7"
-  integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@types/babel__template@*":
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
-  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.20.1"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.1.tgz#dd6f1d2411ae677dcb2db008c962598be31d6acf"
-  integrity sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==
-  dependencies:
-    "@babel/types" "^7.20.7"
-
 "@types/bootstrap@4.6.0":
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/@types/bootstrap/-/bootstrap-4.6.0.tgz#ed7199081947f68d4b37700f8b0a662bd9af622d"
@@ -1697,60 +814,10 @@
     "@types/jquery" "*"
     popper.js "^1.14.1"
 
-"@types/eslint-scope@^3.7.3":
-  version "3.7.5"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.5.tgz#e28b09dbb1d9d35fdfa8a884225f00440dfc5a3e"
-  integrity sha512-JNvhIEyxVW6EoMIFIvj93ZOywYFatlpu9deeH6eSx6PE3WHYvHaQtmHmQeNw7aA81bYGBPPQqdtBm6b1SsQMmA==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "8.44.3"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.3.tgz#96614fae4875ea6328f56de38666f582d911d962"
-  integrity sha512-iM/WfkwAhwmPff3wZuPLYiHX18HI24jU8k1ZSH7P8FHwxTjZ2P6CoX2wnF43oprR+YXJM6UUxATkNvyv/JHd+g==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/estree@*", "@types/estree@^1.0.0":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.2.tgz#ff02bc3dc8317cd668dfec247b750ba1f1d62453"
-  integrity sha512-VeiPZ9MMwXjO32/Xu7+OwflfmeoRwkE/qzndw42gGtgJwZopBnzy2gD//NN1+go1mADzkDcqf/KnFRSjTJ8xJA==
-
-"@types/graceful-fs@^4.1.3":
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae"
-  integrity sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==
-  dependencies:
-    "@types/node" "*"
-
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
-  integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==
-
-"@types/istanbul-lib-report@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
-  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-
-"@types/istanbul-reports@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
-  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
-  dependencies:
-    "@types/istanbul-lib-report" "*"
-
-"@types/jest@^29.0.3":
-  version "29.5.5"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.5.tgz#727204e06228fe24373df9bae76b90f3e8236a2a"
-  integrity sha512-ebylz2hnsWR9mYvmBFbXJXr+33UPc4+ZdxyDXh5w0FlPBTfCVN3wPL+kuOiQt3xvrK419v7XWeAs+AeOksafXg==
-  dependencies:
-    expect "^29.0.0"
-    pretty-format "^29.0.0"
+"@types/estree@1.0.5", "@types/estree@^1.0.0":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
 "@types/jquery@*":
   version "3.5.14"
@@ -1766,29 +833,10 @@
   dependencies:
     "@types/sizzle" "*"
 
-"@types/jsdom@^20.0.0":
-  version "20.0.1"
-  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz#07c14bc19bd2f918c1929541cdaacae894744808"
-  integrity sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==
-  dependencies:
-    "@types/node" "*"
-    "@types/tough-cookie" "*"
-    parse5 "^7.0.0"
-
-"@types/json-schema@*", "@types/json-schema@^7.0.8":
-  version "7.0.13"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.13.tgz#02c24f4363176d2d18fc8b70b9f3c54aba178a85"
-  integrity sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==
-
-"@types/json-schema@^7.0.5":
-  version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
-
-"@types/json-schema@^7.0.9":
-  version "7.0.12"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
-  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
+"@types/json-schema@^7.0.15":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/long@^4.0.1":
   version "4.0.2"
@@ -1812,205 +860,233 @@
   dependencies:
     "@types/node" "*"
 
-"@types/prettier@^2.1.5":
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f"
-  integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==
-
-"@types/qrcode@^1.5.2":
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.5.2.tgz#27633439b7fbe88cc3043b29c8e7612a8a789e15"
-  integrity sha512-W4KDz75m7rJjFbyCctzCtRzZUj+PrUHV+YjqDp50sSRezTbrtEAIq2iTzC6lISARl3qw+8IlcCyljdcVJE0Wug==
+"@types/qrcode@^1.5.5":
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/@types/qrcode/-/qrcode-1.5.5.tgz#993ff7c6b584277eee7aac0a20861eab682f9dac"
+  integrity sha512-CdfBi/e3Qk+3Z/fXYShipBT13OJ2fDO2Q2w5CIP5anLTLIndQG9z6P1cnm+8zCWSpm5dnxMFd/uREtb0EXuQzg==
   dependencies:
     "@types/node" "*"
 
-"@types/semver@^7.3.12":
-  version "7.5.0"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
-  integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
+"@types/semver@^7.5.8":
+  version "7.5.8"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
+  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
 
 "@types/sizzle@*":
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.4.tgz#cd6531924f60834fa4a1b8081f9eecf9bb1117f0"
   integrity sha512-jA2llq2zNkg8HrALI7DtWzhALcVH0l7i89yhY3iBdOz6cBPeACoFq+fkQrjHA39t1hnSFOboZ7A/AY5MMZSlag==
 
-"@types/stack-utils@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
-  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
-
-"@types/strip-bom@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/strip-bom/-/strip-bom-3.0.0.tgz#14a8ec3956c2e81edb7520790aecf21c290aebd2"
-  integrity sha512-xevGOReSYGM7g/kUBZzPqCrR/KYAo+F0yiPc85WFTJa0MSLtyFTVTU6cJu/aV4mid7IffDIWqo69THF2o4JiEQ==
-
-"@types/strip-json-comments@0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1"
-  integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==
-
 "@types/swagger-schema-official@^2.0.22":
   version "2.0.23"
   resolved "https://registry.yarnpkg.com/@types/swagger-schema-official/-/swagger-schema-official-2.0.23.tgz#c03bb5a0c3fe652f2f560026aacc4867d21143c1"
   integrity sha512-9b+/Lh14ROankvt9sWprogb1vK6mn7pXzAhHiEG76I5O3RXJhtdv0IQSGvL5Huezj68IEH8KVPkNZzlNdanTYw==
 
-"@types/tough-cookie@*":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
-  integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
-
-"@types/web-bluetooth@^0.0.18":
-  version "0.0.18"
-  resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.18.tgz#74bd1c8fd3a2058cb6fc76b188fcded50a83d866"
-  integrity sha512-v/ZHEj9xh82usl8LMR3GarzFY1IrbXJw5L4QfQhokjRV91q+SelFqxQWSep1ucXEZ22+dSTwLFkXeur25sPIbw==
-
-"@types/yargs-parser@*":
-  version "21.0.1"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.1.tgz#07773d7160494d56aa882d7531aac7319ea67c3b"
-  integrity sha512-axdPBuLuEJt0c4yI5OZssC19K2Mq1uKdrfZBzuxLvaztgqUtFYZUNw7lETExPYJR9jdEoIg4mb7RQKRQzOkeGQ==
-
-"@types/yargs@^17.0.8":
-  version "17.0.25"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.25.tgz#3edd102803c97356fb4c805b2bbaf7dfc9ab6abc"
-  integrity sha512-gy7iPgwnzNvxgAEi2bXOHWCVOG6f7xsprVJH4MjlAWeBmJ7vh/Y1kwMtUrs64ztf24zVIRCpr3n/z6gm9QIkgg==
-  dependencies:
-    "@types/yargs-parser" "*"
-
-"@typescript-eslint/eslint-plugin@^5.37.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"
-  integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
-  dependencies:
-    "@eslint-community/regexpp" "^4.4.0"
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/type-utils" "5.62.0"
-    "@typescript-eslint/utils" "5.62.0"
+"@types/web-bluetooth@^0.0.20":
+  version "0.0.20"
+  resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz#f066abfcd1cbe66267cdbbf0de010d8a41b41597"
+  integrity sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==
+
+"@typescript-eslint/eslint-plugin@^7.1.1":
+  version "7.7.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.1.tgz#50a9044e3e5fe76b22caf64fb7fc1f97614bdbfd"
+  integrity sha512-KwfdWXJBOviaBVhxO3p5TJiLpNuh2iyXyjmWN0f1nU87pwyvfS0EmjC6ukQVYVFJd/K1+0NWGPDXiyEyQorn0Q==
+  dependencies:
+    "@eslint-community/regexpp" "^4.10.0"
+    "@typescript-eslint/scope-manager" "7.7.1"
+    "@typescript-eslint/type-utils" "7.7.1"
+    "@typescript-eslint/utils" "7.7.1"
+    "@typescript-eslint/visitor-keys" "7.7.1"
     debug "^4.3.4"
     graphemer "^1.4.0"
-    ignore "^5.2.0"
-    natural-compare-lite "^1.4.0"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/parser@^5.37.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7"
-  integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/typescript-estree" "5.62.0"
+    ignore "^5.3.1"
+    natural-compare "^1.4.0"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/parser@^7.1.1":
+  version "7.7.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.7.1.tgz#f940e9f291cdca40c46cb75916217d3a42d6ceea"
+  integrity sha512-vmPzBOOtz48F6JAGVS/kZYk4EkXao6iGrD838sp1w3NQQC0W8ry/q641KU4PrG7AKNAf56NOcR8GOpH8l9FPCw==
+  dependencies:
+    "@typescript-eslint/scope-manager" "7.7.1"
+    "@typescript-eslint/types" "7.7.1"
+    "@typescript-eslint/typescript-estree" "7.7.1"
+    "@typescript-eslint/visitor-keys" "7.7.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
-  integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
+"@typescript-eslint/scope-manager@7.7.1":
+  version "7.7.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.7.1.tgz#07fe59686ca843f66e3e2b5c151522bc38effab2"
+  integrity sha512-PytBif2SF+9SpEUKynYn5g1RHFddJUcyynGpztX3l/ik7KmZEv19WCMhUBkHXPU9es/VWGD3/zg3wg90+Dh2rA==
   dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
+    "@typescript-eslint/types" "7.7.1"
+    "@typescript-eslint/visitor-keys" "7.7.1"
 
-"@typescript-eslint/type-utils@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
-  integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
+"@typescript-eslint/type-utils@7.7.1":
+  version "7.7.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.7.1.tgz#2f8094edca3bebdaad009008929df645ed9c8743"
+  integrity sha512-ZksJLW3WF7o75zaBPScdW1Gbkwhd/lyeXGf1kQCxJaOeITscoSl0MjynVvCzuV5boUz/3fOI06Lz8La55mu29Q==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.62.0"
-    "@typescript-eslint/utils" "5.62.0"
+    "@typescript-eslint/typescript-estree" "7.7.1"
+    "@typescript-eslint/utils" "7.7.1"
     debug "^4.3.4"
-    tsutils "^3.21.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/types@7.7.1":
+  version "7.7.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.7.1.tgz#f903a651fb004c75add08e4e9e207f169d4b98d7"
+  integrity sha512-AmPmnGW1ZLTpWa+/2omPrPfR7BcbUU4oha5VIbSbS1a1Tv966bklvLNXxp3mrbc+P2j4MNOTfDffNsk4o0c6/w==
 
-"@typescript-eslint/types@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
-  integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
+"@typescript-eslint/typescript-estree@7.7.1":
+  version "7.7.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.1.tgz#5cafde48fe390fe1c1b329b2ce0ba8a73c1e87b2"
+  integrity sha512-CXe0JHCXru8Fa36dteXqmH2YxngKJjkQLjxzoj6LYwzZ7qZvgsLSc+eqItCrqIop8Vl2UKoAi0StVWu97FQZIQ==
+  dependencies:
+    "@typescript-eslint/types" "7.7.1"
+    "@typescript-eslint/visitor-keys" "7.7.1"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/utils@7.7.1":
+  version "7.7.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.7.1.tgz#5d161f2b4a55e1bc38b634bebb921e4bd4e4a16e"
+  integrity sha512-QUvBxPEaBXf41ZBbaidKICgVL8Hin0p6prQDu6bbetWo39BKbWJxRsErOzMNT1rXvTll+J7ChrbmMCXM9rsvOQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@types/json-schema" "^7.0.15"
+    "@types/semver" "^7.5.8"
+    "@typescript-eslint/scope-manager" "7.7.1"
+    "@typescript-eslint/types" "7.7.1"
+    "@typescript-eslint/typescript-estree" "7.7.1"
+    semver "^7.6.0"
+
+"@typescript-eslint/visitor-keys@7.7.1":
+  version "7.7.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.1.tgz#da2294796220bb0f3b4add5ecbb1b9c3f4f65798"
+  integrity sha512-gBL3Eq25uADw1LQ9kVpf3hRM+DWzs0uZknHYK3hq4jcTPqVCClHGDnB6UUUV2SFeBeA4KWHWbbLqmbGcZ4FYbw==
+  dependencies:
+    "@typescript-eslint/types" "7.7.1"
+    eslint-visitor-keys "^3.4.3"
+
+"@ungap/structured-clone@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
+  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+
+"@vitejs/plugin-vue2@^2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue2/-/plugin-vue2-2.3.1.tgz#53078d3d9d50d9863f1fbb1c1ef7791a5fcd4948"
+  integrity sha512-/ksaaz2SRLN11JQhLdEUhDzOn909WEk99q9t9w+N12GjQCljzv7GyvAbD/p20aBUjHkvpGOoQ+FCOkG+mjDF4A==
+
+"@vitest/coverage-istanbul@^1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@vitest/coverage-istanbul/-/coverage-istanbul-1.5.1.tgz#43aa3058542cb9b6ef38f3c70d99f00e61eb2f7a"
+  integrity sha512-E8H34Ul4djgxyF6yss767qbfqw+4HrXVfUUufolL9MdK6gVH568aWV/VYQCfnh3+AIwZyjZrdZZH9f2L6zYxig==
+  dependencies:
+    debug "^4.3.4"
+    istanbul-lib-coverage "^3.2.2"
+    istanbul-lib-instrument "^6.0.1"
+    istanbul-lib-report "^3.0.1"
+    istanbul-lib-source-maps "^5.0.4"
+    istanbul-reports "^3.1.6"
+    magicast "^0.3.3"
+    picocolors "^1.0.0"
+    test-exclude "^6.0.0"
+
+"@vitest/expect@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-1.5.0.tgz#961190510a2723bd4abf5540bcec0a4dfd59ef14"
+  integrity sha512-0pzuCI6KYi2SIC3LQezmxujU9RK/vwC1U9R0rLuGlNGcOuDWxqWKu6nUdFsX9tH1WU0SXtAxToOsEjeUn1s3hA==
+  dependencies:
+    "@vitest/spy" "1.5.0"
+    "@vitest/utils" "1.5.0"
+    chai "^4.3.10"
+
+"@vitest/runner@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-1.5.0.tgz#1f7cb78ee4064e73e53d503a19c1b211c03dfe0c"
+  integrity sha512-7HWwdxXP5yDoe7DTpbif9l6ZmDwCzcSIK38kTSIt6CFEpMjX4EpCgT6wUmS0xTXqMI6E/ONmfgRKmaujpabjZQ==
+  dependencies:
+    "@vitest/utils" "1.5.0"
+    p-limit "^5.0.0"
+    pathe "^1.1.1"
 
-"@typescript-eslint/typescript-estree@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
-  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
+"@vitest/snapshot@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-1.5.0.tgz#cd2d611fd556968ce8fb6b356a09b4593c525947"
+  integrity sha512-qpv3fSEuNrhAO3FpH6YYRdaECnnRjg9VxbhdtPwPRnzSfHVXnNzzrpX4cJxqiwgRMo7uRMWDFBlsBq4Cr+rO3A==
   dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
+    magic-string "^0.30.5"
+    pathe "^1.1.1"
+    pretty-format "^29.7.0"
 
-"@typescript-eslint/utils@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
-  integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
+"@vitest/spy@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-1.5.0.tgz#1369a1bec47f46f18eccfa45f1e8fbb9b5e15e77"
+  integrity sha512-vu6vi6ew5N5MMHJjD5PoakMRKYdmIrNJmyfkhRpQt5d9Ewhw9nZ5Aqynbi3N61bvk9UvZ5UysMT6ayIrZ8GA9w==
   dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@types/json-schema" "^7.0.9"
-    "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/typescript-estree" "5.62.0"
-    eslint-scope "^5.1.1"
-    semver "^7.3.7"
-
-"@typescript-eslint/visitor-keys@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
-  integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
-  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    eslint-visitor-keys "^3.3.0"
+    tinyspy "^2.2.0"
 
-"@vimeo/player@^2.10.0":
-  version "2.16.1"
-  resolved "https://registry.yarnpkg.com/@vimeo/player/-/player-2.16.1.tgz#ed2237b8224dd764419b16ec4e6c3ede5bb2224e"
-  integrity sha512-47pUwVFAYBKbmOpxF6CzQc0VwbVi7LCv8i1H44XgRRoMoI7jwAOSi4CDGinjEMoKOKxsn5/p8ze50XZYwgTVWA==
+"@vitest/utils@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-1.5.0.tgz#90c9951f4516f6d595da24876b58e615f6c99863"
+  integrity sha512-BDU0GNL8MWkRkSRdNFvCUCAVOeHaUlVJ9Tx0TYBZyXaaOTmGtUFObzchCivIBrIwKzvZA7A9sCejVhXM2aY98A==
   dependencies:
-    native-promise-only "0.8.1"
-    weakmap-polyfill "2.0.1"
+    diff-sequences "^29.6.3"
+    estree-walker "^3.0.3"
+    loupe "^2.3.7"
+    pretty-format "^29.7.0"
 
-"@volar/language-core@1.10.0", "@volar/language-core@~1.10.0":
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.10.0.tgz#fb6b3ad22e75c53a1ae4d644c4a788b47d411b9d"
-  integrity sha512-ddyWwSYqcbEZNFHm+Z3NZd6M7Ihjcwl/9B5cZd8kECdimVXUFdFi60XHWD27nrWtUQIsUYIG7Ca1WBwV2u2LSQ==
+"@volar/language-core@1.11.1", "@volar/language-core@~1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.11.1.tgz#ecdf12ea8dc35fb8549e517991abcbf449a5ad4f"
+  integrity sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw==
   dependencies:
-    "@volar/source-map" "1.10.0"
+    "@volar/source-map" "1.11.1"
 
-"@volar/source-map@1.10.0", "@volar/source-map@~1.10.0":
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.10.0.tgz#2413eb190ce69fc1a382f58524a3f82306668024"
-  integrity sha512-/ibWdcOzDGiq/GM1JU2eX8fH1bvAhl66hfe8yEgLEzg9txgr6qb5sQ/DEz5PcDL75tF5H5sCRRwn8Eu8ezi9mw==
+"@volar/source-map@1.11.1", "@volar/source-map@~1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.11.1.tgz#535b0328d9e2b7a91dff846cab4058e191f4452f"
+  integrity sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==
   dependencies:
     muggle-string "^0.3.1"
 
-"@volar/typescript@~1.10.0":
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.10.0.tgz#3b16cf7c4c1802eac023ba4e57fe52bdb6d3016f"
-  integrity sha512-OtqGtFbUKYC0pLNIk3mHQp5xWnvL1CJIUc9VE39VdZ/oqpoBh5jKfb9uJ45Y4/oP/WYTrif/Uxl1k8VTPz66Gg==
+"@volar/typescript@~1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.11.1.tgz#ba86c6f326d88e249c7f5cfe4b765be3946fd627"
+  integrity sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ==
   dependencies:
-    "@volar/language-core" "1.10.0"
+    "@volar/language-core" "1.11.1"
+    path-browserify "^1.0.1"
 
 "@vstconsulting/tabsignal@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@vstconsulting/tabsignal/-/tabsignal-2.0.0.tgz#435edaf658c1905125cf4318e47ec4d93a252b0b"
   integrity sha512-3ua0SDgAzyIvuevj2VzbfbbVrHGKUQH1xKSI+d9Pk0eV0v4FxeYYYChrLSJtB/38jkCy9e+oC32RV+PXXC4CwQ==
 
-"@vue/compiler-core@3.3.4":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.3.4.tgz#7fbf591c1c19e1acd28ffd284526e98b4f581128"
-  integrity sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==
+"@vue/compiler-core@3.4.23":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.23.tgz#a08f5998e391ad75e602a66dd7255af9054df2f3"
+  integrity sha512-HAFmuVEwNqNdmk+w4VCQ2pkLk1Vw4XYiiyxEp3z/xvl14aLTUBw2OfVH3vBcx+FtGsynQLkkhK410Nah1N2yyQ==
   dependencies:
-    "@babel/parser" "^7.21.3"
-    "@vue/shared" "3.3.4"
+    "@babel/parser" "^7.24.1"
+    "@vue/shared" "3.4.23"
+    entities "^4.5.0"
     estree-walker "^2.0.2"
-    source-map-js "^1.0.2"
+    source-map-js "^1.2.0"
 
 "@vue/compiler-dom@^3.3.0":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz#f56e09b5f4d7dc350f981784de9713d823341151"
-  integrity sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.23.tgz#6fa622d1e5c8508551564c5dc5948e9cddf60867"
+  integrity sha512-t0b9WSTnCRrzsBGrDd1LNR5HGzYTr7LX3z6nNBG+KGvZLqrT0mY6NsMzOqlVMBKKXKVuusbbB5aOOFgTY+senw==
   dependencies:
-    "@vue/compiler-core" "3.3.4"
-    "@vue/shared" "3.3.4"
+    "@vue/compiler-core" "3.4.23"
+    "@vue/shared" "3.4.23"
 
 "@vue/compiler-sfc@2.7.16":
   version "2.7.16"
@@ -2023,52 +1099,39 @@
   optionalDependencies:
     prettier "^1.18.2 || ^2.0.0"
 
-"@vue/component-compiler-utils@^3.1.0":
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz#f9f5fb53464b0c37b2c8d2f3fbfe44df60f61dc9"
-  integrity sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==
-  dependencies:
-    consolidate "^0.15.1"
-    hash-sum "^1.0.2"
-    lru-cache "^4.1.2"
-    merge-source-map "^1.1.0"
-    postcss "^7.0.36"
-    postcss-selector-parser "^6.0.2"
-    source-map "~0.6.1"
-    vue-template-es2015-compiler "^1.9.0"
-  optionalDependencies:
-    prettier "^1.18.2 || ^2.0.0"
-
 "@vue/devtools-api@^6.5.0":
   version "6.6.1"
   resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.6.1.tgz#7c14346383751d9f6ad4bea0963245b30220ef83"
   integrity sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==
 
-"@vue/language-core@1.8.15":
-  version "1.8.15"
-  resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-1.8.15.tgz#e84536f529f706c072037d495bfd610d4661fbae"
-  integrity sha512-zche5Aw8kkvp3YaghuLiOZyVIpoWHjSQ0EfjxGSsqHOPMamdCoa9x3HtbenpR38UMUoKJ88wiWuiOrV3B/Yq+A==
+"@vue/eslint-config-typescript@^13.0.0":
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/@vue/eslint-config-typescript/-/eslint-config-typescript-13.0.0.tgz#f5f3d986ace34a10f403921d5044831b89a1b679"
+  integrity sha512-MHh9SncG/sfqjVqjcuFLOLD6Ed4dRAis4HNt0dXASeAuLqIAx4YMB1/m2o4pUKK1vCt8fUvYG8KKX2Ot3BVZTg==
+  dependencies:
+    "@typescript-eslint/eslint-plugin" "^7.1.1"
+    "@typescript-eslint/parser" "^7.1.1"
+    vue-eslint-parser "^9.3.1"
+
+"@vue/language-core@1.8.27", "@vue/language-core@^1.8.27":
+  version "1.8.27"
+  resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-1.8.27.tgz#2ca6892cb524e024a44e554e4c55d7a23e72263f"
+  integrity sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==
   dependencies:
-    "@volar/language-core" "~1.10.0"
-    "@volar/source-map" "~1.10.0"
+    "@volar/language-core" "~1.11.1"
+    "@volar/source-map" "~1.11.1"
     "@vue/compiler-dom" "^3.3.0"
-    "@vue/reactivity" "^3.3.0"
     "@vue/shared" "^3.3.0"
-    minimatch "^9.0.0"
+    computeds "^0.0.1"
+    minimatch "^9.0.3"
     muggle-string "^0.3.1"
+    path-browserify "^1.0.1"
     vue-template-compiler "^2.7.14"
 
-"@vue/reactivity@^3.3.0":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.3.4.tgz#a27a29c6cd17faba5a0e99fbb86ee951653e2253"
-  integrity sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==
-  dependencies:
-    "@vue/shared" "3.3.4"
-
-"@vue/shared@3.3.4", "@vue/shared@^3.3.0":
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.3.4.tgz#06e83c5027f464eef861c329be81454bc8b70780"
-  integrity sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==
+"@vue/shared@3.4.23", "@vue/shared@^3.3.0":
+  version "3.4.23"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.23.tgz#e536a6dfd2f5f950d08c2e8ebcfe7e5329a851a1"
+  integrity sha512-wBQ0gvf+SMwsCQOyusNw/GoXPV47WGd1xB5A1Pgzy0sQ3Bi5r5xm3n+92y3gCnB3MWqnRDdvfkRGxhKtbBRNgg==
 
 "@vue/test-utils@^1.3.0":
   version "1.3.6"
@@ -2079,223 +1142,33 @@
     lodash "^4.17.15"
     pretty "^2.0.0"
 
-"@vue/typescript@1.8.15":
-  version "1.8.15"
-  resolved "https://registry.yarnpkg.com/@vue/typescript/-/typescript-1.8.15.tgz#ee8f7a99cf93597fa5503dc27125ddad3bcd32a7"
-  integrity sha512-qWyanQKXOsK84S8rP7QBrqsvUdQ0nZABZmTjXMpb3ox4Bp5IbkscREA3OPUrkgl64mAxwwCzIWcOc3BPTCPjQw==
-  dependencies:
-    "@volar/typescript" "~1.10.0"
-    "@vue/language-core" "1.8.15"
-
-"@vue/vue2-jest@^29.0.0":
-  version "29.2.4"
-  resolved "https://registry.yarnpkg.com/@vue/vue2-jest/-/vue2-jest-29.2.4.tgz#f17b61bbde629a2809db5ed85f88bee972ebe97b"
-  integrity sha512-oU/Ai4sufLlrhsj8GqRqfhMr6Ud4rehmwYP358/SjKcvUqOCoKa2lOBndDzG4uZVMNnQqQbKWIg7wqL3aRYPBA==
-  dependencies:
-    "@babel/plugin-transform-modules-commonjs" "^7.2.0"
-    "@vue/component-compiler-utils" "^3.1.0"
-    chalk "^2.1.0"
-    css-tree "^2.0.1"
-    source-map "0.5.6"
-    tsconfig "^7.0.0"
-
-"@vueuse/core@^10.4.1":
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-10.5.0.tgz#04d1e6d26592bb997bb755a4830ea7583c3e8612"
-  integrity sha512-z/tI2eSvxwLRjOhDm0h/SXAjNm8N5ld6/SC/JQs6o6kpJ6Ya50LnEL8g5hoYu005i28L0zqB5L5yAl8Jl26K3A==
-  dependencies:
-    "@types/web-bluetooth" "^0.0.18"
-    "@vueuse/metadata" "10.5.0"
-    "@vueuse/shared" "10.5.0"
-    vue-demi ">=0.14.6"
-
-"@vueuse/metadata@10.5.0":
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-10.5.0.tgz#7501a88cf5cbf7a515a03f0b8bbe3cecf30cad11"
-  integrity sha512-fEbElR+MaIYyCkeM0SzWkdoMtOpIwO72x8WsZHRE7IggiOlILttqttM69AS13nrDxosnDBYdyy3C5mR1LCxHsw==
-
-"@vueuse/shared@10.5.0":
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-10.5.0.tgz#b3ac8c190a5dae41db5e1b60fe304a9b4247393c"
-  integrity sha512-18iyxbbHYLst9MqU1X1QNdMHIjks6wC7XTVf0KNOv5es/Ms6gjVFCAAWTVP2JStuGqydg3DT+ExpFORUEi9yhg==
-  dependencies:
-    vue-demi ">=0.14.6"
-
-"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
-  integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==
-  dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-
-"@webassemblyjs/floating-point-hex-parser@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
-  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
-
-"@webassemblyjs/helper-api-error@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
-  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
-
-"@webassemblyjs/helper-buffer@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093"
-  integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==
-
-"@webassemblyjs/helper-numbers@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
-  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
-  dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
-    "@webassemblyjs/helper-api-error" "1.11.6"
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/helper-wasm-bytecode@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
-  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
-
-"@webassemblyjs/helper-wasm-section@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577"
-  integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
-
-"@webassemblyjs/ieee754@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
-  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
-"@webassemblyjs/leb128@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
-  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
-  dependencies:
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/utf8@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
-  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
-
-"@webassemblyjs/wasm-edit@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab"
-  integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/helper-wasm-section" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
-    "@webassemblyjs/wasm-opt" "1.11.6"
-    "@webassemblyjs/wasm-parser" "1.11.6"
-    "@webassemblyjs/wast-printer" "1.11.6"
-
-"@webassemblyjs/wasm-gen@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268"
-  integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
-
-"@webassemblyjs/wasm-opt@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2"
-  integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
-    "@webassemblyjs/wasm-parser" "1.11.6"
-
-"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1"
-  integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-api-error" "1.11.6"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/ieee754" "1.11.6"
-    "@webassemblyjs/leb128" "1.11.6"
-    "@webassemblyjs/utf8" "1.11.6"
-
-"@webassemblyjs/wast-printer@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20"
-  integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@xtuc/long" "4.2.2"
-
-"@webpack-cli/configtest@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5"
-  integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==
-
-"@webpack-cli/info@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1"
-  integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==
+"@vueuse/core@^10.9.0":
+  version "10.9.0"
+  resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-10.9.0.tgz#7d779a95cf0189de176fee63cee4ba44b3c85d64"
+  integrity sha512-/1vjTol8SXnx6xewDEKfS0Ra//ncg4Hb0DaZiwKf7drgfMsKFExQ+FnnENcN6efPen+1kIzhLQoGSy0eDUVOMg==
   dependencies:
-    envinfo "^7.7.3"
-
-"@webpack-cli/serve@^1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1"
-  integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==
-
-"@xtuc/ieee754@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
-  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+    "@types/web-bluetooth" "^0.0.20"
+    "@vueuse/metadata" "10.9.0"
+    "@vueuse/shared" "10.9.0"
+    vue-demi ">=0.14.7"
 
-"@xtuc/long@4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
-  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
-
-"JavaScript-autoComplete@https://github.com/Pixabay/JavaScript-autoComplete#1.0.4":
-  version "0.0.0"
-  resolved "https://github.com/Pixabay/JavaScript-autoComplete#eda3201210a86f7fcfb7f496f4b2ca419ff423e8"
+"@vueuse/metadata@10.9.0":
+  version "10.9.0"
+  resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-10.9.0.tgz#769a1a9db65daac15cf98084cbf7819ed3758620"
+  integrity sha512-iddNbg3yZM0X7qFY2sAotomgdHK7YJ6sKUvQqbvwnf7TmaVPxS4EJydcNsVejNdS8iWCtDk+fYXr7E32nyTnGA==
 
-abab@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
-  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
+"@vueuse/shared@10.9.0":
+  version "10.9.0"
+  resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-10.9.0.tgz#13af2a348de15d07b7be2fd0c7fc9853a69d8fe0"
+  integrity sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==
+  dependencies:
+    vue-demi ">=0.14.7"
 
 abbrev@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-acorn-globals@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3"
-  integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==
-  dependencies:
-    acorn "^8.1.0"
-    acorn-walk "^8.0.2"
-
-acorn-import-assertions@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
-  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
-
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
@@ -2315,17 +1188,22 @@ acorn-walk@^7.0.0:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e"
   integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==
 
-acorn-walk@^8.0.0, acorn-walk@^8.0.2:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+acorn-walk@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa"
+  integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==
 
 acorn@^7.0.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz#17ea7e40d7c8640ff54a694c889c26f31704effe"
   integrity sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==
 
-acorn@^8.0.4, acorn@^8.1.0, acorn@^8.7.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0:
+acorn@^8.11.3:
+  version "8.11.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
+
+acorn@^8.9.0:
   version "8.10.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
   integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
@@ -2397,19 +1275,14 @@ admin-lte@3.2.0-rc:
     toastr "^2.1.4"
     uplot "^1.6.15"
 
-agent-base@6:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+agent-base@^7.0.2, agent-base@^7.1.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
+  integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
   dependencies:
-    debug "4"
-
-ajv-keywords@^3.5.2:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
-  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+    debug "^4.3.4"
 
-ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.12.4, ajv@~6.12.6:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2424,13 +1297,6 @@ amdefine@>=0.0.4:
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
-ansi-escapes@^4.2.1:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
-  dependencies:
-    type-fest "^0.21.3"
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -2460,7 +1326,7 @@ ansi_up@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi_up/-/ansi_up-5.2.1.tgz#9437082c7ad4975c15ec57d30a6b55da295bee36"
   integrity sha512-5bz5T/7FRmlxA37zDXhG6cAwlcZtfnmNLDJra66EEIT3kYlw5aPJdbkJEhm59D6kA4Wi5ict6u6IDYHJaQlH+g==
 
-anymatch@^3.0.3, anymatch@~3.1.2:
+anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
@@ -2468,18 +1334,18 @@ anymatch@^3.0.3, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-argparse@^1.0.7:
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+argparse@~1.0.9:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
 aria-query@5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e"
@@ -2505,6 +1371,11 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
+assertion-error@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
+  integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
+
 ast-transform@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/ast-transform/-/ast-transform-0.0.0.tgz#74944058887d8283e189d954600947bc98fe0062"
@@ -2534,100 +1405,6 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-babel-jest@^29.0.0, babel-jest@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.6.1.tgz#a7141ad1ed5ec50238f3cd36127636823111233a"
-  integrity sha512-qu+3bdPEQC6KZSPz+4Fyjbga5OODNcp49j6GKzG1EKbkfyJBxEYGVUmVGpwCSeGouG52R4EgYMLb6p9YeEEQ4A==
-  dependencies:
-    "@jest/transform" "^29.6.1"
-    "@types/babel__core" "^7.1.14"
-    babel-plugin-istanbul "^6.1.1"
-    babel-preset-jest "^29.5.0"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    slash "^3.0.0"
-
-babel-loader@^8.2.3:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8"
-  integrity sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==
-  dependencies:
-    find-cache-dir "^3.3.1"
-    loader-utils "^2.0.0"
-    make-dir "^3.1.0"
-    schema-utils "^2.6.5"
-
-babel-plugin-istanbul@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
-  integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@istanbuljs/load-nyc-config" "^1.0.0"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-instrument "^5.0.4"
-    test-exclude "^6.0.0"
-
-babel-plugin-jest-hoist@^29.5.0:
-  version "29.5.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz#a97db437936f441ec196990c9738d4b88538618a"
-  integrity sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==
-  dependencies:
-    "@babel/template" "^7.3.3"
-    "@babel/types" "^7.3.3"
-    "@types/babel__core" "^7.1.14"
-    "@types/babel__traverse" "^7.0.6"
-
-babel-plugin-polyfill-corejs2@^0.4.6:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz#b2df0251d8e99f229a8e60fc4efa9a68b41c8313"
-  integrity sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==
-  dependencies:
-    "@babel/compat-data" "^7.22.6"
-    "@babel/helper-define-polyfill-provider" "^0.4.3"
-    semver "^6.3.1"
-
-babel-plugin-polyfill-corejs3@^0.8.5:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.5.tgz#a75fa1b0c3fc5bd6837f9ec465c0f48031b8cab1"
-  integrity sha512-Q6CdATeAvbScWPNLB8lzSO7fgUVBkQt6zLgNlfyeCr/EQaEQR+bWiBYYPYAFyE528BMjRhL+1QBMOI4jc/c5TA==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.3"
-    core-js-compat "^3.32.2"
-
-babel-plugin-polyfill-regenerator@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz#d4c49e4b44614607c13fb769bcd85c72bb26a4a5"
-  integrity sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.4.3"
-
-babel-preset-current-node-syntax@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
-  integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
-  dependencies:
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-bigint" "^7.8.3"
-    "@babel/plugin-syntax-class-properties" "^7.8.3"
-    "@babel/plugin-syntax-import-meta" "^7.8.3"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
-
-babel-preset-jest@^29.5.0:
-  version "29.5.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz#57bc8cc88097af7ff6a5ab59d1cd29d52a5916e2"
-  integrity sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==
-  dependencies:
-    babel-plugin-jest-hoist "^29.5.0"
-    babel-preset-current-node-syntax "^1.0.0"
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -2638,21 +1415,11 @@ base64-js@1.3.1, base64-js@^1.1.2, base64-js@^1.3.0:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
   integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-bluebird@^3.1.1:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
 blueimp-canvas-to-blob@^3.29.0:
   version "3.29.0"
   resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.29.0.tgz#d965f06cb1a67fdae207a2be56683f55ef531466"
@@ -2762,24 +1529,14 @@ browserify-optional@^1.0.1:
     ast-types "^0.7.0"
     browser-resolve "^1.8.1"
 
-browserslist@^4.14.5:
-  version "4.21.11"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.11.tgz#35f74a3e51adc4d193dcd76ea13858de7b8fecb8"
-  integrity sha512-xn1UXOKUz7DjdGlg9RrUr0GGiWzI97UQJnugHtH0OLDfJB7jMgoIkYvRIEO1l9EeEERVqeqLYOcFBW9ldjypbQ==
+browserslist@^4.22.2:
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
+  integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
   dependencies:
-    caniuse-lite "^1.0.30001538"
-    electron-to-chromium "^1.4.526"
-    node-releases "^2.0.13"
-    update-browserslist-db "^1.0.13"
-
-browserslist@^4.21.9, browserslist@^4.22.1:
-  version "4.22.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619"
-  integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==
-  dependencies:
-    caniuse-lite "^1.0.30001541"
-    electron-to-chromium "^1.4.535"
-    node-releases "^2.0.13"
+    caniuse-lite "^1.0.30001587"
+    electron-to-chromium "^1.4.668"
+    node-releases "^2.0.14"
     update-browserslist-db "^1.0.13"
 
 bs-custom-file-input@^1.3.4:
@@ -2787,25 +1544,11 @@ bs-custom-file-input@^1.3.4:
   resolved "https://registry.yarnpkg.com/bs-custom-file-input/-/bs-custom-file-input-1.3.4.tgz#c275cb8d4f1c02ba026324292509fa9a747dbda8"
   integrity sha512-NBsQzTnef3OW1MvdKBbMHAYHssCd613MSeJV7z2McXznWtVMnJCy7Ckyc+PwxV6Pk16cu6YBcYWh/ZE0XWNKCA==
 
-bs-logger@0.x:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
-  integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
-  dependencies:
-    fast-json-stable-stringify "2.x"
-
 bs-stepper@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/bs-stepper/-/bs-stepper-1.7.0.tgz#bfa4cc51c4e67957caae57f5bdcba1977186bac1"
   integrity sha512-+DX7UKKgw2GI6ucsSCRd19VHYrxf/8znRCLs1lQVVLxz+h7EqgIOxoHcJ0/QTaaNoR9Cwg78ydo6hXIasyd3LA==
 
-bser@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
-  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
-  dependencies:
-    node-int64 "^0.4.0"
-
 buffer-equal@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
@@ -2816,6 +1559,11 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
+cac@^6.7.14:
+  version "6.7.14"
+  resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959"
+  integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==
+
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -2829,20 +1577,15 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase@^5.0.0, camelcase@^5.3.1:
+camelcase@^5.0.0:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.2.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
-  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
-
-caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541:
-  version "1.0.30001562"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001562.tgz"
-  integrity sha512-kfte3Hym//51EdX4239i+Rmp20EsLIYGdPkERegTgU19hQWCRhsRFGKHTliUlsry53tv17K7n077Kqa0WJU4ng==
+caniuse-lite@^1.0.30001587:
+  version "1.0.30001612"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001612.tgz#d34248b4ec1f117b70b24ad9ee04c90e0b8a14ae"
+  integrity sha512-lFgnZ07UhaCcsSZgWW0K5j4e69dK1u/ltrL9lTUiFOwNHs12S3UMIEYgBV0Z6C6hRDev7iRnMzzYmKabYdXF9g==
 
 centrifuge@^2.8.0:
   version "2.8.5"
@@ -2851,7 +1594,20 @@ centrifuge@^2.8.0:
   dependencies:
     protobufjs "^6.11.2"
 
-chalk@^2.1.0, chalk@^2.4.2:
+chai@^4.3.10:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.4.1.tgz#3603fa6eba35425b0f2ac91a009fe924106e50d1"
+  integrity sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==
+  dependencies:
+    assertion-error "^1.1.0"
+    check-error "^1.0.3"
+    deep-eql "^4.1.3"
+    get-func-name "^2.0.2"
+    loupe "^2.3.6"
+    pathval "^1.1.1"
+    type-detect "^4.0.8"
+
+chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2868,11 +1624,6 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-char-regex@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
-  integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
-
 charenc@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
@@ -2901,6 +1652,13 @@ chartjs-color@^2.1.0:
     chartjs-color-string "^0.6.0"
     color-convert "^1.9.3"
 
+check-error@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.3.tgz#a6502e4312a7ee969f646e83bb3ddd56281bd694"
+  integrity sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==
+  dependencies:
+    get-func-name "^2.0.2"
+
 "chokidar@>=3.0.0 <4.0.0":
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
@@ -2916,21 +1674,6 @@ chartjs-color@^2.1.0:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chrome-trace-event@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
-  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
-
-ci-info@^3.2.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
-  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
-
-cjs-module-lexer@^1.0.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
-  integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==
-
 cliui@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
@@ -2949,35 +1692,16 @@ cliui@^8.0.1:
     strip-ansi "^6.0.1"
     wrap-ansi "^7.0.0"
 
-clone-deep@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
-  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
-  dependencies:
-    is-plain-object "^2.0.4"
-    kind-of "^6.0.2"
-    shallow-clone "^3.0.0"
-
 clone@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
-
 codemirror@^5.62.3:
   version "5.65.15"
   resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.15.tgz#66899278f44a7acde0eb641388cd563fe6dfbe19"
   integrity sha512-YC4EHbbwQeubZzxLl5G4nlbLc1T21QTrKGaOal/Pkm9dVDMZXMH7+ieSPEOZCtO9I68i8/oteJKOxzHC2zR+0g==
 
-collect-v8-coverage@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
-  integrity sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==
-
 color-convert@^1.9.0, color-convert@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
@@ -2997,16 +1721,11 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
-color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4:
+color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-colorette@^2.0.14:
-  version "2.0.19"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
-  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
-
 combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -3014,21 +1733,16 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.19.0, commander@^2.20.0:
+commander@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
+  integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
+
+commander@^2.19.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^7.0.0, commander@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
-  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
-
 compressorjs@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/compressorjs/-/compressorjs-1.2.1.tgz#4dee18ef5032f8166bd0a3258f045eda2cd07671"
@@ -3037,6 +1751,11 @@ compressorjs@^1.2.1:
     blueimp-canvas-to-blob "^3.29.0"
     is-blob "^2.1.0"
 
+computeds@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/computeds/-/computeds-0.0.1.tgz#215b08a4ba3e08a11ff6eee5d6d8d7166a97ce2e"
+  integrity sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -3076,6 +1795,11 @@ condense-newlines@^0.2.1:
     is-whitespace "^0.3.0"
     kind-of "^3.0.2"
 
+confbox@^0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.1.7.tgz#ccfc0a2bcae36a84838e83a3b7f770fb17d6c579"
+  integrity sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==
+
 config-chain@^1.1.13:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
@@ -3084,13 +1808,6 @@ config-chain@^1.1.13:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-consolidate@^0.15.1:
-  version "0.15.1"
-  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
-  integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==
-  dependencies:
-    bluebird "^3.1.1"
-
 convert-source-map@^1.5.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
@@ -3098,49 +1815,32 @@ convert-source-map@^1.5.1:
   dependencies:
     safe-buffer "~5.1.1"
 
-convert-source-map@^1.6.0, convert-source-map@^1.7.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
-  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
-
 convert-source-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-core-js-compat@^3.31.0, core-js-compat@^3.32.2:
-  version "3.33.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.33.0.tgz#24aa230b228406450b2277b7c8bfebae932df966"
-  integrity sha512-0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw==
-  dependencies:
-    browserslist "^4.22.1"
-
 core-js-pure@^3.30.2:
   version "3.33.0"
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.33.0.tgz#938a28754b4d82017a7a8cbd2727b1abecc63591"
   integrity sha512-FKSIDtJnds/YFIEaZ4HszRX7hkxGpNKM7FC9aJ9WLJbSd3lD4vOltFuVIBLR8asSx9frkTSqL0dw90SKQxgKrg==
 
-core-js@^3.30.0:
-  version "3.33.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.33.0.tgz#70366dbf737134761edb017990cf5ce6c6369c40"
-  integrity sha512-HoZr92+ZjFEKar5HS6MC776gYslNOKHt75mEBKWKnPeFDpZ6nH5OeF3S6HFT1mUAUZKrzkez05VboaX8myjSuw==
-
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-cropperjs@^1.5.13:
+cropperjs@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/cropperjs/-/cropperjs-1.6.1.tgz#fd132021d93b824b1b0f2c2c3b763419fb792d89"
   integrity sha512-F4wsi+XkDHCOMrHMYjrTEE4QBOrsHHN5/2VsVAaRq8P7E5z7xQpT75S+f/9WikmBEailas3+yo+6zPIomW+NOA==
 
-cross-fetch@^3.0.4:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
-  integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
+cross-fetch@^3.0.6:
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.8.tgz#0327eba65fd68a7d119f8fb2bf9334a1a7956f82"
+  integrity sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==
   dependencies:
-    node-fetch "2.6.7"
+    node-fetch "^2.6.12"
 
 cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
@@ -3161,54 +1861,17 @@ crypto-js@^4.0.0:
   resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
   integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==
 
-css-loader@^6.5.1:
-  version "6.8.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.8.1.tgz#0f8f52699f60f5e679eab4ec0fcd68b8e8a50a88"
-  integrity sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==
-  dependencies:
-    icss-utils "^5.1.0"
-    postcss "^8.4.21"
-    postcss-modules-extract-imports "^3.0.0"
-    postcss-modules-local-by-default "^4.0.3"
-    postcss-modules-scope "^3.0.0"
-    postcss-modules-values "^4.0.0"
-    postcss-value-parser "^4.2.0"
-    semver "^7.3.8"
-
-css-tree@^2.0.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
-  integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
-  dependencies:
-    mdn-data "2.0.30"
-    source-map-js "^1.0.1"
-
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssfontparser@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/cssfontparser/-/cssfontparser-1.2.1.tgz#f4022fc8f9700c68029d542084afbaf425a3f3e3"
-  integrity sha512-6tun4LoZnj7VN6YeegOVb67KBX/7JJsqvj+pv3ZA7F878/eN33AbGa5b/S/wXxS/tcp8nc40xRUrsPlxIyNUPg==
-
-cssom@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
-  integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==
-
-cssom@~0.3.6:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
-  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
-
-cssstyle@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
-  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
+cssstyle@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-4.0.1.tgz#ef29c598a1e90125c870525490ea4f354db0660a"
+  integrity sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==
   dependencies:
-    cssom "~0.3.6"
+    rrweb-cssom "^0.6.0"
 
 csstype@^3.1.0:
   version "3.1.3"
@@ -3228,14 +1891,13 @@ dash-ast@^1.0.0:
   resolved "https://registry.yarnpkg.com/dash-ast/-/dash-ast-1.0.0.tgz#12029ba5fb2f8aa6f0a861795b23c1b4b6c27d37"
   integrity sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA==
 
-data-urls@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143"
-  integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==
+data-urls@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-5.0.0.tgz#2f76906bce1824429ffecb6920f45a0b30f00dde"
+  integrity sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==
   dependencies:
-    abab "^2.0.6"
-    whatwg-mimetype "^3.0.0"
-    whatwg-url "^11.0.0"
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
 
 datatables.net-autofill-bs4@^2.3.9:
   version "2.3.9"
@@ -3530,7 +2192,7 @@ de-indent@^1.0.2:
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
   integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -3542,15 +2204,17 @@ decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
-decimal.js@^10.4.2:
+decimal.js@^10.4.3:
   version "10.4.3"
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
   integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
 
-dedent@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
-  integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
+deep-eql@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d"
+  integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==
+  dependencies:
+    type-detect "^4.0.0"
 
 deep-equal@^1.0.0:
   version "1.1.1"
@@ -3593,11 +2257,6 @@ deep-is@^0.1.3, deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge@^4.2.2:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
-  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
-
 define-data-property@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.0.tgz#0db13540704e1d8d479a0656cf781267531b9451"
@@ -3621,11 +2280,6 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
-detect-newline@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
-  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
-
 dfa@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/dfa/-/dfa-1.2.0.tgz#96ac3204e2d29c49ea5b57af8d92c2ae12790657"
@@ -3665,23 +2319,11 @@ dom-event-types@^1.0.0:
   resolved "https://registry.yarnpkg.com/dom-event-types/-/dom-event-types-1.1.0.tgz#120c1f92ddea7758db1ccee0a100a33c39f4701b"
   integrity sha512-jNCX+uNJ3v38BKvPbpki6j5ItVlnSqVV6vDWGS6rExzCMjsc39frLjm1n91o6YaKK6AZl0wLloItW6C6mr61BQ==
 
-domexception@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
-  integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==
-  dependencies:
-    webidl-conversions "^7.0.0"
-
 dompurify@^2.3.3:
   version "2.4.5"
   resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.5.tgz#0e89a27601f0bad978f9a924e7a05d5d2cccdd87"
   integrity sha512-jggCCd+8Iqp4Tsz0nIvpcb22InKEBrGz5dw3EQJMs8HPJDsKbFIO3STYtAvCfDx26Muevn1MHVI0XxjgFfmiSA==
 
-dotenv@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-11.0.0.tgz#ee37feddf8ada6d348a79e198312d4a8abfd1c1e"
-  integrity sha512-Fp/b504Y5W+e+FpCxTFMUZ7ZEQkQYF0rx+KZtmwixJxGQbLHrhCwo3FjZgNC8vIfrSi29PABNbMoCGD9YoiXbQ==
-
 dropzone@^5.9.2:
   version "5.9.3"
   resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-5.9.3.tgz#b3070ae090fa48cbc04c17535635537ca72d70d6"
@@ -3694,11 +2336,6 @@ duplexer2@~0.1.4:
   dependencies:
     readable-stream "^2.0.2"
 
-duplexer@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
-  integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
-
 editorconfig@^0.15.3:
   version "0.15.3"
   resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
@@ -3714,56 +2351,26 @@ ekko-lightbox@^5.3.0:
   resolved "https://registry.yarnpkg.com/ekko-lightbox/-/ekko-lightbox-5.3.0.tgz#fbfcd9df93a8d1cdbf8770adc8c05aaac4d24f56"
   integrity sha512-mbacwySuVD3Ad6F2hTkjSTvJt59bcVv2l/TmBerp4xZnLak8tPtA4AScUn4DL42c1ksTiAO6sGhJZ52P/1Qgew==
 
-electron-to-chromium@^1.4.526, electron-to-chromium@^1.4.535:
-  version "1.4.560"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.560.tgz#f251409f1e8f393d0dfdf9ccb0b39de739a06a17"
-  integrity sha512-HhJH/pWAxTaPZl7R3mJ6gCd8MfjQdil9RAWk84qHaLsmPTadydfAmq0a1x8kZtOGQ6pZrWhOYj5uZ8I0meZIgg==
-
-emittery@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
-  integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
+electron-to-chromium@^1.4.668:
+  version "1.4.748"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.748.tgz#aa7d4f2f3eac3a6a863cd1779bd4682b4bb68ed5"
+  integrity sha512-VWqjOlPZn70UZ8FTKUOkUvBLeTQ0xpty66qV0yJcAGY2/CthI4xyW9aEozRVtuwv3Kpf5xTesmJUcPwuJmgP4A==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojis-list@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
-  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
-
 encode-utf8@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda"
   integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==
 
-enhanced-resolve@^5.0.0, enhanced-resolve@^5.15.0:
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
-  integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
-  dependencies:
-    graceful-fs "^4.2.4"
-    tapable "^2.2.0"
-
-entities@^4.4.0:
+entities@^4.4.0, entities@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
-envinfo@^7.7.3:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
-  integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
-
-error-ex@^1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
-
 es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
@@ -3801,11 +2408,6 @@ es-get-iterator@^1.1.3:
     isarray "^2.0.5"
     stop-iteration-iterator "^1.0.0"
 
-es-module-lexer@^1.2.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.1.tgz#c1b0dd5ada807a3b3155315911f364dc4e909db1"
-  integrity sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==
-
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -3873,6 +2475,35 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3, es6-symbol@~3.1.1:
     d "^1.0.1"
     ext "^1.1.2"
 
+esbuild@^0.20.1:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.2.tgz#9d6b2386561766ee6b5a55196c6d766d28c87ea1"
+  integrity sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==
+  optionalDependencies:
+    "@esbuild/aix-ppc64" "0.20.2"
+    "@esbuild/android-arm" "0.20.2"
+    "@esbuild/android-arm64" "0.20.2"
+    "@esbuild/android-x64" "0.20.2"
+    "@esbuild/darwin-arm64" "0.20.2"
+    "@esbuild/darwin-x64" "0.20.2"
+    "@esbuild/freebsd-arm64" "0.20.2"
+    "@esbuild/freebsd-x64" "0.20.2"
+    "@esbuild/linux-arm" "0.20.2"
+    "@esbuild/linux-arm64" "0.20.2"
+    "@esbuild/linux-ia32" "0.20.2"
+    "@esbuild/linux-loong64" "0.20.2"
+    "@esbuild/linux-mips64el" "0.20.2"
+    "@esbuild/linux-ppc64" "0.20.2"
+    "@esbuild/linux-riscv64" "0.20.2"
+    "@esbuild/linux-s390x" "0.20.2"
+    "@esbuild/linux-x64" "0.20.2"
+    "@esbuild/netbsd-x64" "0.20.2"
+    "@esbuild/openbsd-x64" "0.20.2"
+    "@esbuild/sunos-x64" "0.20.2"
+    "@esbuild/win32-arm64" "0.20.2"
+    "@esbuild/win32-ia32" "0.20.2"
+    "@esbuild/win32-x64" "0.20.2"
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -3883,11 +2514,6 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
-escape-string-regexp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
-  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
-
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
@@ -3905,17 +2531,6 @@ escodegen@^1.11.1:
   optionalDependencies:
     source-map "~0.6.1"
 
-escodegen@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17"
-  integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^5.2.0"
-    esutils "^2.0.2"
-  optionalDependencies:
-    source-map "~0.6.1"
-
 escodegen@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.2.0.tgz#09de7967791cc958b7f89a2ddb6d23451af327e1"
@@ -3928,9 +2543,9 @@ escodegen@~1.2.0:
     source-map "~0.1.30"
 
 eslint-config-prettier@^8.3.0:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348"
-  integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11"
+  integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==
 
 eslint-plugin-prettier@^4.0.0:
   version "4.2.1"
@@ -3946,28 +2561,26 @@ eslint-plugin-security@^1.7.1:
   dependencies:
     safe-regex "^2.1.1"
 
-eslint-plugin-vue@^9.5.0:
-  version "9.15.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.15.1.tgz#3c09e0edab444b5d4d9239a12a645a0e2e2ea5be"
-  integrity sha512-CJE/oZOslvmAR9hf8SClTdQ9JLweghT6JCBQNrT2Iel1uVw0W0OLJxzvPd6CxmABKCvLrtyDnqGV37O7KQv6+A==
+eslint-plugin-vitest-globals@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vitest-globals/-/eslint-plugin-vitest-globals-1.5.0.tgz#70d6fb118613543110dbee9dc59ed1032f019d72"
+  integrity sha512-ZSsVOaOIig0oVLzRTyk8lUfBfqzWxr/J3/NFMfGGRIkGQPejJYmDH3gXmSJxAojts77uzAGB/UmVrwi2DC4LYA==
+
+eslint-plugin-vue@^9.25.0:
+  version "9.25.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.25.0.tgz#615cb7bb6d0e2140d21840b9aa51dce69e803e7a"
+  integrity sha512-tDWlx14bVe6Bs+Nnh3IGrD+hb11kf2nukfm6jLsmJIhmiRQ1SUaksvwY9U5MvPB0pcrg0QK0xapQkfITs3RKOA==
   dependencies:
-    "@eslint-community/eslint-utils" "^4.3.0"
+    "@eslint-community/eslint-utils" "^4.4.0"
+    globals "^13.24.0"
     natural-compare "^1.4.0"
-    nth-check "^2.0.1"
-    postcss-selector-parser "^6.0.9"
-    semver "^7.3.5"
-    vue-eslint-parser "^9.3.0"
+    nth-check "^2.1.1"
+    postcss-selector-parser "^6.0.15"
+    semver "^7.6.0"
+    vue-eslint-parser "^9.4.2"
     xml-name-validator "^4.0.0"
 
-eslint-scope@5.1.1, eslint-scope@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
-  dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^4.1.1"
-
-eslint-scope@^7.1.1, eslint-scope@^7.2.0:
+eslint-scope@^7.1.1:
   version "7.2.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.1.tgz#936821d3462675f25a18ac5fd88a67cc15b393bd"
   integrity sha512-CvefSOsDdaYYvxChovdrPo/ZGt8d5lrJWleAc1diXRKhHGiTYEI26cvo8Kle/wGnsizoCJjK73FMg1/IkIwiNA==
@@ -3975,37 +2588,46 @@ eslint-scope@^7.1.1, eslint-scope@^7.2.0:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-visitor-keys@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
-  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
 
 eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994"
   integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==
 
+eslint-visitor-keys@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
+
 eslint@^8.6.0:
-  version "8.45.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.45.0.tgz#bab660f90d18e1364352c0a6b7c6db8edb458b78"
-  integrity sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
+  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.4.0"
-    "@eslint/eslintrc" "^2.1.0"
-    "@eslint/js" "8.44.0"
-    "@humanwhocodes/config-array" "^0.11.10"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.57.0"
+    "@humanwhocodes/config-array" "^0.11.14"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.10.0"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.2.0"
-    eslint-visitor-keys "^3.4.1"
-    espree "^9.6.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
     esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -4038,7 +2660,7 @@ esniff@^2.0.1:
     event-emitter "^0.3.5"
     type "^2.7.2"
 
-espree@^9.3.1, espree@^9.6.0:
+espree@^9.3.1, espree@^9.6.0, espree@^9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
   integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
@@ -4047,7 +2669,7 @@ espree@^9.3.1, espree@^9.6.0:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.4.1"
 
-esprima@^4.0.0, esprima@^4.0.1:
+esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -4071,7 +2693,7 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -4096,6 +2718,13 @@ estree-walker@^2.0.2:
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
   integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
 
+estree-walker@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.3.tgz#67c3e549ec402a487b4fc193d1953a524752340d"
+  integrity sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==
+  dependencies:
+    "@types/estree" "^1.0.0"
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -4124,53 +2753,20 @@ event-emitter@^0.3.5, event-emitter@~0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
-events@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
-  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
-
-execa@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
-  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
+execa@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c"
+  integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==
   dependencies:
     cross-spawn "^7.0.3"
-    get-stream "^6.0.0"
-    human-signals "^2.1.0"
-    is-stream "^2.0.0"
+    get-stream "^8.0.1"
+    human-signals "^5.0.0"
+    is-stream "^3.0.0"
     merge-stream "^2.0.0"
-    npm-run-path "^4.0.1"
-    onetime "^5.1.2"
-    signal-exit "^3.0.3"
-    strip-final-newline "^2.0.0"
-
-exit@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
-
-expect@^29.0.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc"
-  integrity sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==
-  dependencies:
-    "@jest/expect-utils" "^29.7.0"
-    jest-get-type "^29.6.3"
-    jest-matcher-utils "^29.7.0"
-    jest-message-util "^29.7.0"
-    jest-util "^29.7.0"
-
-expect@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-29.6.1.tgz#64dd1c8f75e2c0b209418f2b8d36a07921adfdf1"
-  integrity sha512-XEdDLonERCU1n9uR56/Stx9OqojaLAQtZf9PrCHH9Hl8YXiEIka3H4NXJ3NOIBmQJTg7+j7buh34PMHfJujc8g==
-  dependencies:
-    "@jest/expect-utils" "^29.6.1"
-    "@types/node" "*"
-    jest-get-type "^29.4.3"
-    jest-matcher-utils "^29.6.1"
-    jest-message-util "^29.6.1"
-    jest-util "^29.6.1"
+    npm-run-path "^5.1.0"
+    onetime "^6.0.0"
+    signal-exit "^4.1.0"
+    strip-final-newline "^3.0.0"
 
 ext@^1.1.2:
   version "1.4.0"
@@ -4192,9 +2788,9 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-diff@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
-  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
+  integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
 fast-glob@^3.2.9:
   version "3.3.0"
@@ -4207,7 +2803,7 @@ fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
+fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
@@ -4227,11 +2823,6 @@ fastclick@^1.0.6:
   resolved "https://registry.yarnpkg.com/fastclick/-/fastclick-1.0.6.tgz#161625b27b1a5806405936bda9a2c1926d06be6a"
   integrity sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo=
 
-fastest-levenshtein@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
-  integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
-
 fastq@^1.6.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
@@ -4239,13 +2830,6 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-fb-watchman@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
-  integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
-  dependencies:
-    bser "2.1.1"
-
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -4268,16 +2852,7 @@ filterizr@^2.2.4:
     fast-memoize "^2.5.1"
     imagesloaded "^4.1.4"
 
-find-cache-dir@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
-  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.2"
-    pkg-dir "^4.1.0"
-
-find-up@^4.0.0, find-up@^4.1.0:
+find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -4299,17 +2874,18 @@ flag-icon-css@^3.5.0:
   integrity sha512-pgJnJLrtb0tcDgU1fzGaQXmR8h++nXvILJ+r5SmOXaaL/2pocunQo2a8TAXhjQnBpRLPtZ1KCz/TYpqeNuE2ew==
 
 flat-cache@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
+  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
   dependencies:
-    flatted "^3.1.0"
+    flatted "^3.2.9"
+    keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flatted@^3.1.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
-  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
+flatted@^3.2.9:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
+  integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
 flot@^4.2.2:
   version "4.2.2"
@@ -4342,17 +2918,21 @@ fs-extra@^9.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-extra@~7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
-
-fsevents@~2.3.2:
+fsevents@~2.3.2, fsevents@~2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
@@ -4362,7 +2942,7 @@ fullcalendar@^5.9.0:
   resolved "https://registry.yarnpkg.com/fullcalendar/-/fullcalendar-5.11.5.tgz#db57191c4741ceb9a217e47a4cdba8c9ad81b738"
   integrity sha512-eaVD6zOvuFXVpoMKlg2FQAj8e+PcpitBMwlzwRJJr1zOi/dXMYAksx2hLzwtsr93FVUNSSo16xwMTTZz6+prKQ==
 
-function-bind@^1.1.1:
+function-bind@^1.1.1, function-bind@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
@@ -4387,6 +2967,11 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-func-name@^2.0.1, get-func-name@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41"
+  integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==
+
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
@@ -4397,15 +2982,10 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
 
-get-package-type@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
-  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
-
-get-stream@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
-  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
+get-stream@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2"
+  integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==
 
 glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
@@ -4421,11 +3001,6 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
-glob-to-regexp@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
-  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
-
 glob@^7.1.3, glob@^7.1.4:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
@@ -4454,10 +3029,10 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.19.0:
-  version "13.20.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
-  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
+globals@^13.19.0, globals@^13.24.0:
+  version "13.24.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
   dependencies:
     type-fest "^0.20.2"
 
@@ -4473,6 +3048,11 @@ globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
+globrex@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
+  integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
+
 gopd@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
@@ -4480,7 +3060,7 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -4495,13 +3075,6 @@ graphemer@^1.4.0:
   resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
-gzip-size@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
-  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
-  dependencies:
-    duplexer "^0.1.2"
-
 has-bigints@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
@@ -4553,22 +3126,24 @@ has@^1.0.3:
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.4.tgz#2eb2860e000011dae4f1406a86fe80e530fb2ec6"
   integrity sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==
 
-hash-sum@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
-  integrity sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==
+hasown@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+  dependencies:
+    function-bind "^1.1.2"
 
 he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-html-encoding-sniffer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
-  integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==
+html-encoding-sniffer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz#696df529a7cfd82446369dc5193e590a3735b448"
+  integrity sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==
   dependencies:
-    whatwg-encoding "^2.0.0"
+    whatwg-encoding "^3.1.1"
 
 html-escaper@^2.0.0:
   version "2.0.2"
@@ -4580,27 +3155,26 @@ html5-qrcode@^2.3.8:
   resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.8.tgz#0b0cdf7a9926cfd4be530e13a51db47592adfa0d"
   integrity sha512-jsr4vafJhwoLVEDW3n1KvPnCCXWaQfRng0/EEYk1vNcQGcG/htAdhJX0be8YyqMoSz7+hZvOZSTAepsabiuhiQ==
 
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+http-proxy-agent@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
   dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
+    agent-base "^7.1.0"
+    debug "^4.3.4"
 
-https-proxy-agent@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
+https-proxy-agent@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168"
+  integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==
   dependencies:
-    agent-base "6"
+    agent-base "^7.0.2"
     debug "4"
 
-human-signals@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
-  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+human-signals@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28"
+  integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==
 
 icheck-bootstrap@^3.0.1:
   version "3.0.1"
@@ -4612,18 +3186,18 @@ iconv-lite@0.6.3, iconv-lite@^0.6.3:
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
   dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
-
-icss-utils@^5.0.0, icss-utils@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
-  integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
+    safer-buffer ">= 2.1.2 < 3.0.0"
 
 ignore@^5.2.0:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
   integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
 
+ignore@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
+  integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
+
 imagesloaded@^4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/imagesloaded/-/imagesloaded-4.1.4.tgz#1376efcd162bb768c34c3727ac89cc04051f3cc7"
@@ -4631,10 +3205,12 @@ imagesloaded@^4.1.4:
   dependencies:
     ev-emitter "^1.0.0"
 
-imask@^6.6.3:
-  version "6.6.3"
-  resolved "https://registry.yarnpkg.com/imask/-/imask-6.6.3.tgz#f9619cea770b97b5ef616acb036d27cf4a1b33d8"
-  integrity sha512-a9MTDhm+ET4G2IRcdUGuVTXHS05WsRNPGM5CeNJnXiXuoi4zv7g0/UDFLlRF4lBBeb8EWds4C4JVwhI0nuAIug==
+imask@^7.6.0:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/imask/-/imask-7.6.0.tgz#ed071748cfdf6b12ac153f69878e08c4333df984"
+  integrity sha512-6EHsq1q7v5+M4Vas2MGrs2oRpxPRWPwPDiL0HmG1ikBI/0hOwvkxRhVRFQnWIlZcTG7R8iw0az5V+z868qnQ9A==
+  dependencies:
+    "@babel/runtime-corejs3" "^7.24.4"
 
 immediate@~3.0.5:
   version "3.0.6"
@@ -4654,13 +3230,10 @@ import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-local@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
-  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
-  dependencies:
-    pkg-dir "^4.2.0"
-    resolve-cwd "^3.0.0"
+import-lazy@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
+  integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
 
 imurmurhash@^0.1.4:
   version "0.1.4"
@@ -4699,11 +3272,6 @@ internal-slot@^1.0.4:
     has "^1.0.3"
     side-channel "^1.0.4"
 
-interpret@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
-  integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
-
 ion-rangeslider@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/ion-rangeslider/-/ion-rangeslider-2.3.1.tgz#92ade52cb56fc30b9162d0483ff02b6f9ed237c2"
@@ -4731,11 +3299,6 @@ is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
     get-intrinsic "^1.2.0"
     is-typed-array "^1.1.10"
 
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
-
 is-bigint@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
@@ -4778,19 +3341,12 @@ is-callable@^1.1.4, is-callable@^1.2.3:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-core-module@^2.11.0, is-core-module@^2.13.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
-  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
-  dependencies:
-    has "^1.0.3"
-
-is-core-module@^2.8.1:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4"
-  integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==
+is-core-module@^2.1.0, is-core-module@^2.13.0:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
   dependencies:
-    has "^1.0.3"
+    hasown "^2.0.0"
 
 is-date-object@^1.0.1, is-date-object@^1.0.5:
   version "1.0.5"
@@ -4814,11 +3370,6 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-generator-fn@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
-  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
-
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
@@ -4853,18 +3404,6 @@ is-path-inside@^3.0.3:
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
-is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-plain-object@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
-  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
-
 is-potential-custom-element-name@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
@@ -4905,10 +3444,10 @@ is-shared-array-buffer@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
-  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+is-stream@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
+  integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
 
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
@@ -4964,49 +3503,44 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
-
-istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
-  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
+istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0, istanbul-lib-coverage@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
+  integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
 
-istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
-  integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
+istanbul-lib-instrument@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.2.tgz#91655936cf7380e4e473383081e38478b69993b1"
+  integrity sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==
   dependencies:
-    "@babel/core" "^7.12.3"
-    "@babel/parser" "^7.14.7"
-    "@istanbuljs/schema" "^0.1.2"
+    "@babel/core" "^7.23.9"
+    "@babel/parser" "^7.23.9"
+    "@istanbuljs/schema" "^0.1.3"
     istanbul-lib-coverage "^3.2.0"
-    semver "^6.3.0"
+    semver "^7.5.4"
 
-istanbul-lib-report@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
-  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
+istanbul-lib-report@^3.0.0, istanbul-lib-report@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
+  integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
   dependencies:
     istanbul-lib-coverage "^3.0.0"
-    make-dir "^3.0.0"
+    make-dir "^4.0.0"
     supports-color "^7.1.0"
 
-istanbul-lib-source-maps@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
-  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
+istanbul-lib-source-maps@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.4.tgz#1947003c72a91b6310efeb92d2a91be8804d92c2"
+  integrity sha512-wHOoEsNJTVltaJp8eVkm8w+GVkVNHT2YDYo53YdzQEL2gWm1hBX5cGFR9hQJtuGLebidVX7et3+dmDZrmclduw==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.23"
     debug "^4.1.1"
     istanbul-lib-coverage "^3.0.0"
-    source-map "^0.6.1"
 
-istanbul-reports@^3.1.3:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae"
-  integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
+istanbul-reports@^3.1.6:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b"
+  integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
@@ -5016,424 +3550,10 @@ izitoast@1.4.0:
   resolved "https://registry.yarnpkg.com/izitoast/-/izitoast-1.4.0.tgz#1aa4e3408b7159fba743506af66d8be54fd929fb"
   integrity sha512-Oc1X2wiQtPp39i5VpIjf3GJf5sfCtHKXZ5szx7RareyEeFLUlcEW0FSfBni28+Ul6KNKZRKzhVuWzSP4Xngh0w==
 
-jest-canvas-mock@^2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.5.2.tgz#7e21ebd75e05ab41c890497f6ba8a77f915d2ad6"
-  integrity sha512-vgnpPupjOL6+L5oJXzxTxFrlGEIbHdZqFU+LFNdtLxZ3lRDCl17FlTMM7IatoRQkrcyOTMlDinjUguqmQ6bR2A==
-  dependencies:
-    cssfontparser "^1.2.1"
-    moo-color "^1.0.2"
-
-jest-changed-files@^29.5.0:
-  version "29.5.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.5.0.tgz#e88786dca8bf2aa899ec4af7644e16d9dcf9b23e"
-  integrity sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==
-  dependencies:
-    execa "^5.0.0"
-    p-limit "^3.1.0"
-
-jest-circus@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.6.1.tgz#861dab37e71a89907d1c0fabc54a0019738ed824"
-  integrity sha512-tPbYLEiBU4MYAL2XoZme/bgfUeotpDBd81lgHLCbDZZFaGmECk0b+/xejPFtmiBP87GgP/y4jplcRpbH+fgCzQ==
-  dependencies:
-    "@jest/environment" "^29.6.1"
-    "@jest/expect" "^29.6.1"
-    "@jest/test-result" "^29.6.1"
-    "@jest/types" "^29.6.1"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    co "^4.6.0"
-    dedent "^0.7.0"
-    is-generator-fn "^2.0.0"
-    jest-each "^29.6.1"
-    jest-matcher-utils "^29.6.1"
-    jest-message-util "^29.6.1"
-    jest-runtime "^29.6.1"
-    jest-snapshot "^29.6.1"
-    jest-util "^29.6.1"
-    p-limit "^3.1.0"
-    pretty-format "^29.6.1"
-    pure-rand "^6.0.0"
-    slash "^3.0.0"
-    stack-utils "^2.0.3"
-
-jest-cli@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.6.1.tgz#99d9afa7449538221c71f358f0fdd3e9c6e89f72"
-  integrity sha512-607dSgTA4ODIN6go9w6xY3EYkyPFGicx51a69H7yfvt7lN53xNswEVLovq+E77VsTRi5fWprLH0yl4DJgE8Ing==
-  dependencies:
-    "@jest/core" "^29.6.1"
-    "@jest/test-result" "^29.6.1"
-    "@jest/types" "^29.6.1"
-    chalk "^4.0.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.9"
-    import-local "^3.0.2"
-    jest-config "^29.6.1"
-    jest-util "^29.6.1"
-    jest-validate "^29.6.1"
-    prompts "^2.0.1"
-    yargs "^17.3.1"
-
-jest-config@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.6.1.tgz#d785344509065d53a238224c6cdc0ed8e2f2f0dd"
-  integrity sha512-XdjYV2fy2xYixUiV2Wc54t3Z4oxYPAELUzWnV6+mcbq0rh742X2p52pii5A3oeRzYjLnQxCsZmp0qpI6klE2cQ==
-  dependencies:
-    "@babel/core" "^7.11.6"
-    "@jest/test-sequencer" "^29.6.1"
-    "@jest/types" "^29.6.1"
-    babel-jest "^29.6.1"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    deepmerge "^4.2.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    jest-circus "^29.6.1"
-    jest-environment-node "^29.6.1"
-    jest-get-type "^29.4.3"
-    jest-regex-util "^29.4.3"
-    jest-resolve "^29.6.1"
-    jest-runner "^29.6.1"
-    jest-util "^29.6.1"
-    jest-validate "^29.6.1"
-    micromatch "^4.0.4"
-    parse-json "^5.2.0"
-    pretty-format "^29.6.1"
-    slash "^3.0.0"
-    strip-json-comments "^3.1.1"
-
-jest-diff@^29.6.1, jest-diff@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
-  integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
-  dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^29.6.3"
-    jest-get-type "^29.6.3"
-    pretty-format "^29.7.0"
-
-jest-docblock@^29.4.3:
-  version "29.4.3"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.4.3.tgz#90505aa89514a1c7dceeac1123df79e414636ea8"
-  integrity sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==
-  dependencies:
-    detect-newline "^3.0.0"
-
-jest-each@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.6.1.tgz#975058e5b8f55c6780beab8b6ab214921815c89c"
-  integrity sha512-n5eoj5eiTHpKQCAVcNTT7DRqeUmJ01hsAL0Q1SMiBHcBcvTKDELixQOGMCpqhbIuTcfC4kMfSnpmDqRgRJcLNQ==
-  dependencies:
-    "@jest/types" "^29.6.1"
-    chalk "^4.0.0"
-    jest-get-type "^29.4.3"
-    jest-util "^29.6.1"
-    pretty-format "^29.6.1"
-
-jest-environment-jsdom@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz#d206fa3551933c3fd519e5dfdb58a0f5139a837f"
-  integrity sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==
-  dependencies:
-    "@jest/environment" "^29.7.0"
-    "@jest/fake-timers" "^29.7.0"
-    "@jest/types" "^29.6.3"
-    "@types/jsdom" "^20.0.0"
-    "@types/node" "*"
-    jest-mock "^29.7.0"
-    jest-util "^29.7.0"
-    jsdom "^20.0.0"
-
-jest-environment-node@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.6.1.tgz#08a122dece39e58bc388da815a2166c58b4abec6"
-  integrity sha512-ZNIfAiE+foBog24W+2caIldl4Irh8Lx1PUhg/GZ0odM1d/h2qORAsejiFc7zb+SEmYPn1yDZzEDSU5PmDkmVLQ==
-  dependencies:
-    "@jest/environment" "^29.6.1"
-    "@jest/fake-timers" "^29.6.1"
-    "@jest/types" "^29.6.1"
-    "@types/node" "*"
-    jest-mock "^29.6.1"
-    jest-util "^29.6.1"
-
-jest-fetch-mock@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz#31749c456ae27b8919d69824f1c2bd85fe0a1f3b"
-  integrity sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==
-  dependencies:
-    cross-fetch "^3.0.4"
-    promise-polyfill "^8.1.3"
-
-jest-get-type@^29.4.3, jest-get-type@^29.6.3:
-  version "29.6.3"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
-  integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
-
-jest-haste-map@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.6.1.tgz#62655c7a1c1b349a3206441330fb2dbdb4b63803"
-  integrity sha512-0m7f9PZXxOCk1gRACiVgX85knUKPKLPg4oRCjLoqIm9brTHXaorMA0JpmtmVkQiT8nmXyIVoZd/nnH1cfC33ig==
-  dependencies:
-    "@jest/types" "^29.6.1"
-    "@types/graceful-fs" "^4.1.3"
-    "@types/node" "*"
-    anymatch "^3.0.3"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.9"
-    jest-regex-util "^29.4.3"
-    jest-util "^29.6.1"
-    jest-worker "^29.6.1"
-    micromatch "^4.0.4"
-    walker "^1.0.8"
-  optionalDependencies:
-    fsevents "^2.3.2"
-
-jest-leak-detector@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.6.1.tgz#66a902c81318e66e694df7d096a95466cb962f8e"
-  integrity sha512-OrxMNyZirpOEwkF3UHnIkAiZbtkBWiye+hhBweCHkVbCgyEy71Mwbb5zgeTNYWJBi1qgDVfPC1IwO9dVEeTLwQ==
-  dependencies:
-    jest-get-type "^29.4.3"
-    pretty-format "^29.6.1"
-
-jest-matcher-utils@^29.6.1, jest-matcher-utils@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12"
-  integrity sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==
-  dependencies:
-    chalk "^4.0.0"
-    jest-diff "^29.7.0"
-    jest-get-type "^29.6.3"
-    pretty-format "^29.7.0"
-
-jest-message-util@^29.6.1, jest-message-util@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3"
-  integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^29.6.3"
-    "@types/stack-utils" "^2.0.0"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    micromatch "^4.0.4"
-    pretty-format "^29.7.0"
-    slash "^3.0.0"
-    stack-utils "^2.0.3"
-
-jest-mock@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.6.1.tgz#049ee26aea8cbf54c764af649070910607316517"
-  integrity sha512-brovyV9HBkjXAEdRooaTQK42n8usKoSRR3gihzUpYeV/vwqgSoNfrksO7UfSACnPmxasO/8TmHM3w9Hp3G1dgw==
-  dependencies:
-    "@jest/types" "^29.6.1"
-    "@types/node" "*"
-    jest-util "^29.6.1"
-
-jest-mock@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347"
-  integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==
-  dependencies:
-    "@jest/types" "^29.6.3"
-    "@types/node" "*"
-    jest-util "^29.7.0"
-
-jest-pnp-resolver@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
-  integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
-
-jest-regex-util@^29.4.3:
-  version "29.4.3"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.4.3.tgz#a42616141e0cae052cfa32c169945d00c0aa0bb8"
-  integrity sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==
-
-jest-resolve-dependencies@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.6.1.tgz#b85b06670f987a62515bbf625d54a499e3d708f5"
-  integrity sha512-BbFvxLXtcldaFOhNMXmHRWx1nXQO5LoXiKSGQcA1LxxirYceZT6ch8KTE1bK3X31TNG/JbkI7OkS/ABexVahiw==
-  dependencies:
-    jest-regex-util "^29.4.3"
-    jest-snapshot "^29.6.1"
-
-jest-resolve@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.6.1.tgz#4c3324b993a85e300add2f8609f51b80ddea39ee"
-  integrity sha512-AeRkyS8g37UyJiP9w3mmI/VXU/q8l/IH52vj/cDAyScDcemRbSBhfX/NMYIGilQgSVwsjxrCHf3XJu4f+lxCMg==
-  dependencies:
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^29.6.1"
-    jest-pnp-resolver "^1.2.2"
-    jest-util "^29.6.1"
-    jest-validate "^29.6.1"
-    resolve "^1.20.0"
-    resolve.exports "^2.0.0"
-    slash "^3.0.0"
-
-jest-runner@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.6.1.tgz#54557087e7972d345540d622ab5bfc3d8f34688c"
-  integrity sha512-tw0wb2Q9yhjAQ2w8rHRDxteryyIck7gIzQE4Reu3JuOBpGp96xWgF0nY8MDdejzrLCZKDcp8JlZrBN/EtkQvPQ==
-  dependencies:
-    "@jest/console" "^29.6.1"
-    "@jest/environment" "^29.6.1"
-    "@jest/test-result" "^29.6.1"
-    "@jest/transform" "^29.6.1"
-    "@jest/types" "^29.6.1"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    emittery "^0.13.1"
-    graceful-fs "^4.2.9"
-    jest-docblock "^29.4.3"
-    jest-environment-node "^29.6.1"
-    jest-haste-map "^29.6.1"
-    jest-leak-detector "^29.6.1"
-    jest-message-util "^29.6.1"
-    jest-resolve "^29.6.1"
-    jest-runtime "^29.6.1"
-    jest-util "^29.6.1"
-    jest-watcher "^29.6.1"
-    jest-worker "^29.6.1"
-    p-limit "^3.1.0"
-    source-map-support "0.5.13"
-
-jest-runtime@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.6.1.tgz#8a0fc9274ef277f3d70ba19d238e64334958a0dc"
-  integrity sha512-D6/AYOA+Lhs5e5il8+5pSLemjtJezUr+8zx+Sn8xlmOux3XOqx4d8l/2udBea8CRPqqrzhsKUsN/gBDE/IcaPQ==
-  dependencies:
-    "@jest/environment" "^29.6.1"
-    "@jest/fake-timers" "^29.6.1"
-    "@jest/globals" "^29.6.1"
-    "@jest/source-map" "^29.6.0"
-    "@jest/test-result" "^29.6.1"
-    "@jest/transform" "^29.6.1"
-    "@jest/types" "^29.6.1"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    cjs-module-lexer "^1.0.0"
-    collect-v8-coverage "^1.0.0"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^29.6.1"
-    jest-message-util "^29.6.1"
-    jest-mock "^29.6.1"
-    jest-regex-util "^29.4.3"
-    jest-resolve "^29.6.1"
-    jest-snapshot "^29.6.1"
-    jest-util "^29.6.1"
-    slash "^3.0.0"
-    strip-bom "^4.0.0"
-
-jest-snapshot@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.6.1.tgz#0d083cb7de716d5d5cdbe80d598ed2fbafac0239"
-  integrity sha512-G4UQE1QQ6OaCgfY+A0uR1W2AY0tGXUPQpoUClhWHq1Xdnx1H6JOrC2nH5lqnOEqaDgbHFgIwZ7bNq24HpB180A==
-  dependencies:
-    "@babel/core" "^7.11.6"
-    "@babel/generator" "^7.7.2"
-    "@babel/plugin-syntax-jsx" "^7.7.2"
-    "@babel/plugin-syntax-typescript" "^7.7.2"
-    "@babel/types" "^7.3.3"
-    "@jest/expect-utils" "^29.6.1"
-    "@jest/transform" "^29.6.1"
-    "@jest/types" "^29.6.1"
-    "@types/prettier" "^2.1.5"
-    babel-preset-current-node-syntax "^1.0.0"
-    chalk "^4.0.0"
-    expect "^29.6.1"
-    graceful-fs "^4.2.9"
-    jest-diff "^29.6.1"
-    jest-get-type "^29.4.3"
-    jest-matcher-utils "^29.6.1"
-    jest-message-util "^29.6.1"
-    jest-util "^29.6.1"
-    natural-compare "^1.4.0"
-    pretty-format "^29.6.1"
-    semver "^7.5.3"
-
-jest-util@^29.0.0:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.6.1.tgz#c9e29a87a6edbf1e39e6dee2b4689b8a146679cb"
-  integrity sha512-NRFCcjc+/uO3ijUVyNOQJluf8PtGCe/W6cix36+M3cTFgiYqFOOW5MgN4JOOcvbUhcKTYVd1CvHz/LWi8d16Mg==
-  dependencies:
-    "@jest/types" "^29.6.1"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    graceful-fs "^4.2.9"
-    picomatch "^2.2.3"
-
-jest-util@^29.6.1, jest-util@^29.7.0:
-  version "29.7.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
-  integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
-  dependencies:
-    "@jest/types" "^29.6.3"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    graceful-fs "^4.2.9"
-    picomatch "^2.2.3"
-
-jest-validate@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.6.1.tgz#765e684af6e2c86dce950aebefbbcd4546d69f7b"
-  integrity sha512-r3Ds69/0KCN4vx4sYAbGL1EVpZ7MSS0vLmd3gV78O+NAx3PDQQukRU5hNHPXlyqCgFY8XUk7EuTMLugh0KzahA==
-  dependencies:
-    "@jest/types" "^29.6.1"
-    camelcase "^6.2.0"
-    chalk "^4.0.0"
-    jest-get-type "^29.4.3"
-    leven "^3.1.0"
-    pretty-format "^29.6.1"
-
-jest-watcher@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.6.1.tgz#7c0c43ddd52418af134c551c92c9ea31e5ec942e"
-  integrity sha512-d4wpjWTS7HEZPaaj8m36QiaP856JthRZkrgcIY/7ISoUWPIillrXM23WPboZVLbiwZBt4/qn2Jke84Sla6JhFA==
-  dependencies:
-    "@jest/test-result" "^29.6.1"
-    "@jest/types" "^29.6.1"
-    "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    emittery "^0.13.1"
-    jest-util "^29.6.1"
-    string-length "^4.0.1"
-
-jest-worker@^27.4.5:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
-  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
-jest-worker@^29.6.1:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.6.1.tgz#64b015f0e985ef3a8ad049b61fe92b3db74a5319"
-  integrity sha512-U+Wrbca7S8ZAxAe9L6nb6g8kPdia5hj32Puu5iOqBCMTMWFHXuK6dOV2IFrpedbTV8fjMFLdWNttQTBL6u2MRA==
-  dependencies:
-    "@types/node" "*"
-    jest-util "^29.6.1"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
-jest@^29.0.0:
-  version "29.6.1"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-29.6.1.tgz#74be1cb719c3abe439f2d94aeb18e6540a5b02ad"
-  integrity sha512-Nirw5B4nn69rVUZtemCQhwxOBhm0nsp3hmtF4rzCeWD7BkjAXRIji7xWQfnTNbz9g0aVsBX6aZK3n+23LM6uDw==
-  dependencies:
-    "@jest/core" "^29.6.1"
-    "@jest/types" "^29.6.1"
-    import-local "^3.0.2"
-    jest-cli "^29.6.1"
+jju@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
+  integrity sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==
 
 jquery-knob-chif@^1.2.13:
   version "1.2.13"
@@ -5513,13 +3633,10 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
+js-tokens@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-9.0.0.tgz#0f893996d6f3ed46df7f0a3b12a03f5fd84223c1"
+  integrity sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==
 
 js-yaml@^4.1.0:
   version "4.1.0"
@@ -5533,57 +3650,47 @@ jsbarcode@^3.11.5:
   resolved "https://registry.yarnpkg.com/jsbarcode/-/jsbarcode-3.11.6.tgz#96e8fbc3395476e162982a6064b98a09b5ea02c0"
   integrity sha512-G5TKGyKY1zJo0ZQKFM1IIMfy0nF2rs92BLlCz+cU4/TazIc4ZH+X1GYeDRt7TKjrYqmPfTjwTBkU/QnQlsYiuA==
 
-jsdom@^20.0.0:
-  version "20.0.3"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db"
-  integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==
-  dependencies:
-    abab "^2.0.6"
-    acorn "^8.8.1"
-    acorn-globals "^7.0.0"
-    cssom "^0.5.0"
-    cssstyle "^2.3.0"
-    data-urls "^3.0.2"
-    decimal.js "^10.4.2"
-    domexception "^4.0.0"
-    escodegen "^2.0.0"
+jsdom@^24.0.0:
+  version "24.0.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-24.0.0.tgz#e2dc04e4c79da368481659818ee2b0cd7c39007c"
+  integrity sha512-UDS2NayCvmXSXVP6mpTj+73JnNQadZlr9N68189xib2tx5Mls7swlTNao26IoHv46BZJFvXygyRtyXd1feAk1A==
+  dependencies:
+    cssstyle "^4.0.1"
+    data-urls "^5.0.0"
+    decimal.js "^10.4.3"
     form-data "^4.0.0"
-    html-encoding-sniffer "^3.0.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.1"
+    html-encoding-sniffer "^4.0.0"
+    http-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.2"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.2"
-    parse5 "^7.1.1"
+    nwsapi "^2.2.7"
+    parse5 "^7.1.2"
+    rrweb-cssom "^0.6.0"
     saxes "^6.0.0"
     symbol-tree "^3.2.4"
-    tough-cookie "^4.1.2"
-    w3c-xmlserializer "^4.0.0"
+    tough-cookie "^4.1.3"
+    w3c-xmlserializer "^5.0.0"
     webidl-conversions "^7.0.0"
-    whatwg-encoding "^2.0.0"
-    whatwg-mimetype "^3.0.0"
-    whatwg-url "^11.0.0"
-    ws "^8.11.0"
-    xml-name-validator "^4.0.0"
+    whatwg-encoding "^3.1.1"
+    whatwg-mimetype "^4.0.0"
+    whatwg-url "^14.0.0"
+    ws "^8.16.0"
+    xml-name-validator "^5.0.0"
 
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
-
 jsgrid@^1.5.3:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/jsgrid/-/jsgrid-1.5.3.tgz#b15fc426483153bee2b6b567312f675d92834a0d"
   integrity sha1-sV/EJkgxU77itrVnMS9nXZKDSg0=
 
-json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
-  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
@@ -5595,18 +3702,18 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-json5@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
-  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
-  dependencies:
-    minimist "^1.2.0"
-
-json5@^2.1.2, json5@^2.2.2, json5@^2.2.3:
+json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonfile@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179"
@@ -5626,6 +3733,18 @@ jszip@^3.10.1, jszip@^3.7.1:
     readable-stream "~2.3.6"
     setimmediate "^1.0.5"
 
+jwt-decode@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-4.0.0.tgz#2270352425fd413785b2faf11f6e755c5151bd4b"
+  integrity sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==
+
+keyv@^4.5.3:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
+  dependencies:
+    json-buffer "3.0.1"
+
 kind-of@^3.0.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -5633,25 +3752,10 @@ kind-of@^3.0.2:
   dependencies:
     is-buffer "^1.1.5"
 
-kind-of@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-kleur@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
-  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
-
-klona@^2.0.4:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
-  integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
-
-leven@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
-  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
+kolorist@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/kolorist/-/kolorist-1.8.0.tgz#edddbbbc7894bc13302cdf740af6374d4a04743c"
+  integrity sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==
 
 levn@^0.4.1:
   version "0.4.1"
@@ -5676,38 +3780,18 @@ lie@~3.3.0:
   dependencies:
     immediate "~3.0.5"
 
-lines-and-columns@^1.1.6:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
-  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
-
 liquor-tree@^0.2.70:
   version "0.2.70"
   resolved "https://registry.yarnpkg.com/liquor-tree/-/liquor-tree-0.2.70.tgz#451ec5a0041994f82f895f1fe47c8cc81a034845"
   integrity sha512-5CiMlDVmuveYwwc27mYe1xZ3J4aHhZBErUhIp9ov4v4wIBso+s5JAByOOit4iOCMCQ5ODd8VggbKymzZREYbBQ==
 
-loader-runner@^4.2.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
-  integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
-
-loader-utils@^1.0.2, loader-utils@^1.1.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
-  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^1.0.1"
-
-loader-utils@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
-  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
+local-pkg@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-0.5.0.tgz#093d25a346bae59a99f80e75f6e9d36d7e8c925c"
+  integrity sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==
   dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^2.1.2"
+    mlly "^1.4.2"
+    pkg-types "^1.0.3"
 
 locate-path@^5.0.0:
   version "5.0.0"
@@ -5723,47 +3807,22 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-lodash.debounce@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
-
-lodash.escape@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
-  integrity sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw==
-
-lodash.flatten@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
-  integrity sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==
-
-lodash.invokemap@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.invokemap/-/lodash.invokemap-4.6.0.tgz#1748cda5d8b0ef8369c4eb3ec54c21feba1f2d62"
-  integrity sha512-CfkycNtMqgUlfjfdh2BhKO/ZXrP8ePOX5lEU/g0R3ItJcnuxWDwokMGKx1hWcfOikmyOVx6X9IwWnDGlgKl61w==
+lodash.get@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+  integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
 
-lodash.memoize@4.x:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-  integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
 
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.pullall@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.pullall/-/lodash.pullall-4.2.0.tgz#9d98b8518b7c965b0fae4099bd9fb7df8bbf38ba"
-  integrity sha512-VhqxBKH0ZxPpLhiu68YD1KnHmbhQJQctcipvmFnqIBDYzcIHzf3Zpu0tpeOKtR4x76p9yohc506eGdOjTmyIBg==
-
-lodash.uniqby@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
-  integrity sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==
-
-lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.21:
+lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.21, lodash@~4.17.15:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -5773,7 +3832,14 @@ long@^4.0.0:
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
-lru-cache@^4.1.2, lru-cache@^4.1.5:
+loupe@^2.3.6, loupe@^2.3.7:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.7.tgz#6e69b7d4db7d3ab436328013d37d1c8c3540c697"
+  integrity sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==
+  dependencies:
+    get-func-name "^2.0.1"
+
+lru-cache@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -5807,24 +3873,28 @@ magic-string@0.25.1:
   dependencies:
     sourcemap-codec "^1.4.1"
 
-make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
-  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+magic-string@^0.30.5, magic-string@^0.30.8:
+  version "0.30.10"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.10.tgz#123d9c41a0cb5640c892b041d4cfb3bd0aa4b39e"
+  integrity sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==
   dependencies:
-    semver "^6.0.0"
+    "@jridgewell/sourcemap-codec" "^1.4.15"
 
-make-error@1.x:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
-  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+magicast@^0.3.3:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.3.4.tgz#bbda1791d03190a24b00ff3dd18151e7fd381d19"
+  integrity sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==
+  dependencies:
+    "@babel/parser" "^7.24.4"
+    "@babel/types" "^7.24.0"
+    source-map-js "^1.2.0"
 
-makeerror@1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
-  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
+make-dir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+  integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
   dependencies:
-    tmpl "1.0.5"
+    semver "^7.5.3"
 
 md5@^2.2.1:
   version "2.3.0"
@@ -5835,11 +3905,6 @@ md5@^2.2.1:
     crypt "0.0.2"
     is-buffer "~1.1.6"
 
-mdn-data@2.0.30:
-  version "2.0.30"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
-  integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
-
 merge-source-map@1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
@@ -5847,13 +3912,6 @@ merge-source-map@1.0.4:
   dependencies:
     source-map "^0.5.6"
 
-merge-source-map@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
-  integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==
-  dependencies:
-    source-map "^0.6.1"
-
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -5864,7 +3922,7 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-micromatch@^4.0.0, micromatch@^4.0.4:
+micromatch@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -5877,17 +3935,17 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12, mime-types@^2.1.27:
+mime-types@^2.1.12:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
     mime-db "1.52.0"
 
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+mimic-fn@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
+  integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
 
 minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
@@ -5903,29 +3961,34 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^9.0.0:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
+minimatch@^9.0.3, minimatch@^9.0.4:
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@~3.0.3:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1"
+  integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimist@^1.1.3:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
-minimist@^1.2.0:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
-  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-
-moment-timezone@^0.5.28:
-  version "0.5.45"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c"
-  integrity sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==
+mlly@^1.4.2, mlly@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.6.1.tgz#0983067dc3366d6314fc5e12712884e6978d028f"
+  integrity sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==
   dependencies:
-    moment "^2.29.4"
+    acorn "^8.11.3"
+    pathe "^1.1.2"
+    pkg-types "^1.0.3"
+    ufo "^1.3.2"
 
 moment-timezone@^0.5.31:
   version "0.5.33"
@@ -5934,6 +3997,13 @@ moment-timezone@^0.5.31:
   dependencies:
     moment ">= 2.9.0"
 
+moment-timezone@^0.5.45:
+  version "0.5.45"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c"
+  integrity sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==
+  dependencies:
+    moment "^2.29.4"
+
 "moment@>= 2.9.0":
   version "2.29.4"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
@@ -5944,33 +4014,21 @@ moment@^2.10.2:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
 
-moment@^2.24.0, moment@^2.29.4:
-  version "2.30.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
-  integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
-
 moment@^2.29.0, moment@^2.29.1:
   version "2.29.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
   integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
 
+moment@^2.29.4, moment@^2.30.1:
+  version "2.30.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
+  integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
+
 moment@^2.9.0:
   version "2.26.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.26.0.tgz#5e1f82c6bafca6e83e808b30c8705eed0dcbd39a"
   integrity sha512-oIixUO+OamkUkwjhAVE18rAMfRJNsNe/Stid/gwHSOfHrOtw9EhAY2AHvdKZ/k/MggcYELFCJz/Sn2pL8b8JMw==
 
-moo-color@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/moo-color/-/moo-color-1.0.3.tgz#d56435f8359c8284d83ac58016df7427febece74"
-  integrity sha512-i/+ZKXMDf6aqYtBhuOcej71YSlbjT3wCO/4H1j8rPvxDJEifdwgg5MaFyu6iYAT8GBZJg2z0dkgK4YMzvURALQ==
-  dependencies:
-    color-name "^1.1.4"
-
-mrmime@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27"
-  integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -5981,57 +4039,32 @@ muggle-string@^0.3.1:
   resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.3.1.tgz#e524312eb1728c63dd0b2ac49e3282e6ed85963a"
   integrity sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==
 
-nanoid@^3.3.6:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
-  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
-
 nanoid@^3.3.7:
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
   integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
-native-promise-only@0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/native-promise-only/-/native-promise-only-0.8.1.tgz#20a318c30cb45f71fe7adfbf7b21c99c1472ef11"
-  integrity sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE=
-
-natural-compare-lite@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
-  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
-
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-neo-async@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
-  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
-
 next-tick@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
   integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
 
-node-fetch@2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+node-fetch@^2.6.12:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
   dependencies:
     whatwg-url "^5.0.0"
 
-node-int64@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
-  integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
-
-node-releases@^2.0.13:
-  version "2.0.13"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
-  integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
+node-releases@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
+  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
 nopt@^6.0.0:
   version "6.0.0"
@@ -6045,24 +4078,24 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-npm-run-path@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+npm-run-path@^5.1.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.3.0.tgz#e23353d0ebb9317f174e93417e4a4d82d0249e9f"
+  integrity sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==
   dependencies:
-    path-key "^3.0.0"
+    path-key "^4.0.0"
 
-nth-check@^2.0.1:
+nth-check@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
   integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
   dependencies:
     boolbase "^1.0.0"
 
-nwsapi@^2.2.2:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30"
-  integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==
+nwsapi@^2.2.7:
+  version "2.2.9"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.9.tgz#7f3303218372db2e9f27c27766bcfc59ae7e61c6"
+  integrity sha512-2f3F0SEEer8bBu0dsNCFF50N0cTThV1nWFYcEYFZttdW0lDAoybv9cQoK7X7/68Z89S7FoRrVjP1LPX4XRf9vg==
 
 object-inspect@^1.6.0:
   version "1.7.0"
@@ -6115,6 +4148,13 @@ object.assign@^4.1.4:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
+oidc-client-ts@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/oidc-client-ts/-/oidc-client-ts-3.0.1.tgz#be264fb87c89f74f73863646431c32cd06f5ceb7"
+  integrity sha512-xX8unZNtmtw3sOz4FPSqDhkLFnxCDsdo2qhFEH2opgWnF/iXMFoYdBQzkwCxAZVgt3FT3DnuBY3k80EZHT0RYg==
+  dependencies:
+    jwt-decode "^4.0.0"
+
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -6122,17 +4162,12 @@ once@^1.3.0:
   dependencies:
     wrappy "1"
 
-onetime@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
+onetime@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4"
+  integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==
   dependencies:
-    mimic-fn "^2.1.0"
-
-opener@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
-  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
+    mimic-fn "^4.0.0"
 
 optionator@^0.8.1:
   version "0.8.3"
@@ -6175,12 +4210,19 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.2, p-limit@^3.1.0:
+p-limit@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
-    yocto-queue "^0.1.0"
+    yocto-queue "^0.1.0"
+
+p-limit@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-5.0.0.tgz#6946d5b7140b649b7a33a027d89b4c625b3a5985"
+  integrity sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==
+  dependencies:
+    yocto-queue "^1.0.0"
 
 p-locate@^4.1.0:
   version "4.1.0"
@@ -6223,23 +4265,18 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-json@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
-  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    error-ex "^1.3.1"
-    json-parse-even-better-errors "^2.3.0"
-    lines-and-columns "^1.1.6"
-
-parse5@^7.0.0, parse5@^7.1.1:
+parse5@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
   integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
   dependencies:
     entities "^4.4.0"
 
+path-browserify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
+  integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
+
 path-exists@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -6250,11 +4287,16 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-path-key@^3.0.0, path-key@^3.1.0:
+path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
+path-key@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18"
+  integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==
+
 path-parse@^1.0.6, path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
@@ -6265,6 +4307,16 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+pathe@^1.1.1, pathe@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.2.tgz#6c4cb47a945692e48a1ddd6e4094d170516437ec"
+  integrity sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==
+
+pathval@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
+  integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==
+
 pdfmake@^0.2.2:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.2.7.tgz#a7a46532ffde032674929988393c20b075cf65e3"
@@ -6275,22 +4327,17 @@ pdfmake@^0.2.2:
     iconv-lite "^0.6.3"
     xmldoc "^1.1.2"
 
-picocolors@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
-  integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
-
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-pinia@^2.1.6:
+pinia@^2.1.7:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.1.7.tgz#4cf5420d9324ca00b7b4984d3fbf693222115bbc"
   integrity sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==
@@ -6298,17 +4345,14 @@ pinia@^2.1.6:
     "@vue/devtools-api" "^6.5.0"
     vue-demi ">=0.14.5"
 
-pirates@^4.0.4:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
-  integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
-
-pkg-dir@^4.1.0, pkg-dir@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+pkg-types@^1.0.3:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.1.0.tgz#3ec1bf33379030fd0a34c227b6c650e8ea7ca271"
+  integrity sha512-/RpmvKdxKf8uILTtoOhAgf30wYbP2Qw+L9p3Rvshx1JZVX+XQNZQFjlbmGHEGIm4CkVPlSn+NXmIM8+9oWQaSA==
   dependencies:
-    find-up "^4.0.0"
+    confbox "^0.1.7"
+    mlly "^1.6.1"
+    pathe "^1.1.2"
 
 png-js@^1.0.0:
   version "1.0.0"
@@ -6330,55 +4374,14 @@ portal-vue@^2.1.7:
   resolved "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.7.tgz#ea08069b25b640ca08a5b86f67c612f15f4e4ad4"
   integrity sha512-+yCno2oB3xA7irTt0EU5Ezw22L2J51uKAacE/6hMPMoO/mx3h4rXFkkBkT4GFsMDv/vEe8TNKC3ujJJ0PTwb6g==
 
-postcss-modules-extract-imports@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
-  integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
-
-postcss-modules-local-by-default@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz#b08eb4f083050708998ba2c6061b50c2870ca524"
-  integrity sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==
-  dependencies:
-    icss-utils "^5.0.0"
-    postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.1.0"
-
-postcss-modules-scope@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
-  integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
-  dependencies:
-    postcss-selector-parser "^6.0.4"
-
-postcss-modules-values@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
-  integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
-  dependencies:
-    icss-utils "^5.0.0"
-
-postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.9:
-  version "6.0.13"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b"
-  integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==
+postcss-selector-parser@^6.0.15:
+  version "6.0.16"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz#3b88b9f5c5abd989ef4e2fc9ec8eedd34b20fb04"
+  integrity sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
-  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-
-postcss@^7.0.36:
-  version "7.0.39"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
-  integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
-  dependencies:
-    picocolors "^0.2.1"
-    source-map "^0.6.1"
-
 postcss@^8.4.14:
   version "8.4.35"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.35.tgz#60997775689ce09011edf083a549cea44aabe2f7"
@@ -6388,14 +4391,14 @@ postcss@^8.4.14:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.4.21:
-  version "8.4.24"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.24.tgz#f714dba9b2284be3cc07dbd2fc57ee4dc972d2df"
-  integrity sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==
+postcss@^8.4.38:
+  version "8.4.38"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
+  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
   dependencies:
-    nanoid "^3.3.6"
+    nanoid "^3.3.7"
     picocolors "^1.0.0"
-    source-map-js "^1.0.2"
+    source-map-js "^1.2.0"
 
 prelude-ls@^1.2.1:
   version "1.2.1"
@@ -6433,7 +4436,7 @@ pretty-format@^27.0.2:
     ansi-styles "^5.0.0"
     react-is "^17.0.1"
 
-pretty-format@^29.0.0, pretty-format@^29.6.1, pretty-format@^29.7.0:
+pretty-format@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
   integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
@@ -6456,19 +4459,6 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
-promise-polyfill@^8.1.3:
-  version "8.2.3"
-  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.2.3.tgz#2edc7e4b81aff781c88a0d577e5fe9da822107c6"
-  integrity sha512-Og0+jCRQetV84U8wVjMNccfGCnMQ9mGs9Hv78QFe+pSDD3gWTpz0y+1QCuxy5d/vBFuZ3iwP2eycAkvqIMPmWg==
-
-prompts@^2.0.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
-  integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
-  dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.5"
-
 prosemirror-commands@^1.1.9:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.5.1.tgz#89ddfa14e144dcc7fb0938aa0e2568c7fdde306f"
@@ -6569,17 +4559,17 @@ psl@^1.1.33:
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
-punycode@^2.1.0, punycode@^2.1.1:
+punycode@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
   integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
-pure-rand@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.2.tgz#a9c2ddcae9b68d736a8163036f088a2781c8b306"
-  integrity sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==
+punycode@^2.1.1, punycode@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
-qrcode@^1.4.4:
+qrcode@^1.5.3:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.3.tgz#03afa80912c0dccf12bc93f615a535aad1066170"
   integrity sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==
@@ -6608,13 +4598,6 @@ quote-stream@^1.0.1:
     minimist "^1.1.3"
     through2 "^2.0.0"
 
-randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
 "raphael@^2.2.0 || ^2.1.1", raphael@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.3.0.tgz#eabeb09dba861a1d4cee077eaafb8c53f3131f89"
@@ -6652,37 +4635,11 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-rechoir@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
-  integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
-  dependencies:
-    resolve "^1.9.0"
-
-regenerate-unicode-properties@^10.1.0:
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz#6b0e05489d9076b04c436f318d9b067bba459480"
-  integrity sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==
-  dependencies:
-    regenerate "^1.4.2"
-
-regenerate@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
-  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
-
 regenerator-runtime@^0.14.0:
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45"
   integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==
 
-regenerator-transform@^0.15.2:
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
-  integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==
-  dependencies:
-    "@babel/runtime" "^7.8.4"
-
 regexp-tree@~0.1.1:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd"
@@ -6705,25 +4662,6 @@ regexp.prototype.flags@^1.5.0:
     define-properties "^1.2.0"
     set-function-name "^2.0.0"
 
-regexpu-core@^5.3.1:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
-  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
-  dependencies:
-    "@babel/regjsgen" "^0.8.0"
-    regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.1.0"
-    regjsparser "^0.9.1"
-    unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.1.0"
-
-regjsparser@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
-  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
-  dependencies:
-    jsesc "~0.5.0"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -6739,28 +4677,11 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
-resolve-cwd@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
-  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
-  dependencies:
-    resolve-from "^5.0.0"
-
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve-from@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
-  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
-
-resolve.exports@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
-  integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
-
 resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
@@ -6773,7 +4694,15 @@ resolve@^1.1.5:
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.14.2:
+resolve@~1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+  dependencies:
+    is-core-module "^2.1.0"
+    path-parse "^1.0.6"
+
+resolve@~1.22.1:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
   integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -6782,24 +4711,6 @@ resolve@^1.14.2:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-resolve@^1.20.0:
-  version "1.22.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
-  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
-  dependencies:
-    is-core-module "^2.11.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^1.9.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
-  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
-  dependencies:
-    is-core-module "^2.8.1"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
@@ -6812,11 +4723,41 @@ rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
+rollup@^4.13.0:
+  version "4.14.3"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.14.3.tgz#bcbb7784b35826d3164346fa6d5aac95190d8ba9"
+  integrity sha512-ag5tTQKYsj1bhrFC9+OEWqb5O6VYgtQDO9hPDBMmIbePwhfSr+ExlcU741t8Dhw5DkPCQf6noz0jb36D6W9/hw==
+  dependencies:
+    "@types/estree" "1.0.5"
+  optionalDependencies:
+    "@rollup/rollup-android-arm-eabi" "4.14.3"
+    "@rollup/rollup-android-arm64" "4.14.3"
+    "@rollup/rollup-darwin-arm64" "4.14.3"
+    "@rollup/rollup-darwin-x64" "4.14.3"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.14.3"
+    "@rollup/rollup-linux-arm-musleabihf" "4.14.3"
+    "@rollup/rollup-linux-arm64-gnu" "4.14.3"
+    "@rollup/rollup-linux-arm64-musl" "4.14.3"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.14.3"
+    "@rollup/rollup-linux-riscv64-gnu" "4.14.3"
+    "@rollup/rollup-linux-s390x-gnu" "4.14.3"
+    "@rollup/rollup-linux-x64-gnu" "4.14.3"
+    "@rollup/rollup-linux-x64-musl" "4.14.3"
+    "@rollup/rollup-win32-arm64-msvc" "4.14.3"
+    "@rollup/rollup-win32-ia32-msvc" "4.14.3"
+    "@rollup/rollup-win32-x64-msvc" "4.14.3"
+    fsevents "~2.3.2"
+
 rope-sequence@^1.3.0:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.3.tgz#3f67fc106288b84b71532b4a5fd9d4881e4457f0"
   integrity sha512-85aZYCxweiD5J8yTEbw+E6A27zSnLPNDL0WfPdw3YYodq7WjnTKo0q4dtyQ2gz23iPT8Q9CUyJtAaUNcTxRf5Q==
 
+rrweb-cssom@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1"
+  integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==
+
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
@@ -6831,11 +4772,6 @@ rxjs@^7.8.1:
   dependencies:
     tslib "^2.1.0"
 
-safe-buffer@^5.1.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
-
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -6853,14 +4789,6 @@ safe-regex@^2.1.1:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-loader@^12.4.0:
-  version "12.6.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.6.0.tgz#5148362c8e2cdd4b950f3c63ac5d16dbfed37bcb"
-  integrity sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==
-  dependencies:
-    klona "^2.0.4"
-    neo-async "^2.6.2"
-
 sass@^1.47.0:
   version "1.68.0"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.68.0.tgz#0034b0cc9a50248b7d1702ac166fd25990023669"
@@ -6882,24 +4810,6 @@ saxes@^6.0.0:
   dependencies:
     xmlchars "^2.2.0"
 
-schema-utils@^2.6.5:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
-  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
-  dependencies:
-    "@types/json-schema" "^7.0.5"
-    ajv "^6.12.4"
-    ajv-keywords "^3.5.2"
-
-schema-utils@^3.1.1, schema-utils@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
-  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
-  dependencies:
-    "@types/json-schema" "^7.0.8"
-    ajv "^6.12.5"
-    ajv-keywords "^3.5.2"
-
 scope-analyzer@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/scope-analyzer/-/scope-analyzer-2.1.1.tgz#5156c27de084d74bf75af9e9506aaf95c6e73dd6"
@@ -6935,24 +4845,24 @@ semver@^5.6.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@^6.0.0, semver@^6.3.0, semver@^6.3.1:
+semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3:
+semver@^7.3.6, semver@~7.5.4:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
-serialize-javascript@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c"
-  integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==
+semver@^7.5.3, semver@^7.5.4, semver@^7.6.0:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
+  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
   dependencies:
-    randombytes "^2.1.0"
+    lru-cache "^6.0.0"
 
 set-blocking@^2.0.0:
   version "2.0.0"
@@ -6973,13 +4883,6 @@ setimmediate@^1.0.5:
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
   integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
 
-shallow-clone@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
-  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
-  dependencies:
-    kind-of "^6.0.2"
-
 shallow-copy@~0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
@@ -7011,67 +4914,42 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
+siginfo@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/siginfo/-/siginfo-2.0.0.tgz#32e76c70b79724e3bb567cb9d543eb858ccfaf30"
+  integrity sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==
+
 sigmund@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
   integrity sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==
 
-signal-exit@^3.0.3, signal-exit@^3.0.7:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
-sirv@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.3.tgz#ca5868b87205a74bef62a469ed0296abceccd446"
-  integrity sha512-O9jm9BsID1P+0HOi81VpXPoDxYP374pkOLzACAoyUQ/3OUVndNpsz6wMnY2z+yOxzbllCKZrM+9QrWsv4THnyA==
-  dependencies:
-    "@polka/url" "^1.0.0-next.20"
-    mrmime "^1.0.0"
-    totalist "^3.0.0"
-
-sisteransi@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
-  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
+signal-exit@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2:
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
-source-map-support@0.5.13:
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
-  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@~0.5.20:
-  version "0.5.21"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
-  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map@0.5.6:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-  integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==
+source-map-js@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
+  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
 source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -7103,12 +4981,10 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-stack-utils@^2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
-  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
-  dependencies:
-    escape-string-regexp "^2.0.0"
+stackback@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/stackback/-/stackback-0.0.2.tgz#1ac8a0d9483848d1695e418b6d031a3c3ce68e3b"
+  integrity sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==
 
 static-eval@^2.0.5:
   version "2.0.5"
@@ -7137,6 +5013,11 @@ static-module@^3.0.2:
     static-eval "^2.0.5"
     through2 "~2.0.3"
 
+std-env@^3.5.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.7.0.tgz#c9f7386ced6ecf13360b6c6c55b8aaa4ef7481d2"
+  integrity sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==
+
 stop-iteration-iterator@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4"
@@ -7144,13 +5025,10 @@ stop-iteration-iterator@^1.0.0:
   dependencies:
     internal-slot "^1.0.4"
 
-string-length@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
-  integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
-  dependencies:
-    char-regex "^1.0.2"
-    strip-ansi "^6.0.0"
+string-argv@~0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
+  integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
 
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
@@ -7191,35 +5069,22 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-bom@^3.0.0:
+strip-final-newline@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
-
-strip-bom@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
-  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
-
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-
-strip-json-comments@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd"
+  integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==
 
-strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.1, strip-json-comments@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-style-loader@^3.3.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.3.tgz#bba8daac19930169c0c9c96706749a597ae3acff"
-  integrity sha512-53BiGLXAcll9maCYtZi2RCQZKa8NQQai5C4horqKyRmHj9H7QmcUyucrH+4KW/gBQbXM2AsB0axoEcFZPlfPcw==
+strip-literal@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/strip-literal/-/strip-literal-2.1.0.tgz#6d82ade5e2e74f5c7e8739b6c84692bd65f0bd2a"
+  integrity sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==
+  dependencies:
+    js-tokens "^9.0.0"
 
 summernote@^0.8.18:
   version "0.8.20"
@@ -7240,7 +5105,7 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^8.0.0, supports-color@^8.1.1:
+supports-color@^8.1.1, supports-color@~8.1.1:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -7257,16 +5122,16 @@ sweetalert2@10.16.9, sweetalert2@^10.16.9:
   resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-10.16.9.tgz#8ed86f2fa811a136667a48357e204348705be8c9"
   integrity sha512-oNe+md5tmmS3fGfVHa7gVPlun7Td2oANSacnZCeghnrr3OHBi6UPVPU+GFrymwaDqwQspACilLRmRnM7aTjNPA==
 
+swiper@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/swiper/-/swiper-11.1.1.tgz#5efaa222d4a47a3ac75090cfc2fda6e53e564982"
+  integrity sha512-jGmEA/fNz1lACIcY4/40ggm1Gcyv+EUivmgV/Jd2WFPsEJhbWXnRAwzZR8OPjkBLtDxmzcoYG/iiAMWfRs0YKQ==
+
 symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-tapable@^2.1.1, tapable@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
-  integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
-
 tempusdominus-bootstrap-4@^5.39.0:
   version "5.39.0"
   resolved "https://registry.yarnpkg.com/tempusdominus-bootstrap-4/-/tempusdominus-bootstrap-4-5.39.0.tgz#f13dcfec6c41b37c5fe509f08bd513590c64411f"
@@ -7278,27 +5143,6 @@ tempusdominus-bootstrap-4@^5.39.0:
     moment-timezone "^0.5.31"
     popper.js "^1.16.1"
 
-terser-webpack-plugin@^5.3.7:
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1"
-  integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jest-worker "^27.4.5"
-    schema-utils "^3.1.1"
-    serialize-javascript "^6.0.1"
-    terser "^5.16.8"
-
-terser@^5.16.8:
-  version "5.20.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.20.0.tgz#ea42aea62578703e33def47d5c5b93c49772423e"
-  integrity sha512-e56ETryaQDyebBwJIWYB2TT6f2EZ0fL0sW/JRXNMN26zZdKi2u/E/5my5lG6jNxym6qsrVXfFRmOdV42zlAgLQ==
-  dependencies:
-    "@jridgewell/source-map" "^0.3.3"
-    acorn "^8.8.2"
-    commander "^2.20.0"
-    source-map-support "~0.5.20"
-
 test-exclude@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -7331,10 +5175,20 @@ tiny-inflate@^1.0.0, tiny-inflate@^1.0.2:
   resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz#122715494913a1805166aaf7c93467933eea26c4"
   integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==
 
-tmpl@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
-  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
+tinybench@^2.5.1:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.7.0.tgz#d56198a69bead7e240c8f9542484f3eb3c3f749d"
+  integrity sha512-Qgayeb106x2o4hNzNjsZEfFziw8IbKqtbXBjVh7VIZfBxfD5M4gWtpyx5+YTae2gJ6Y6Dz/KLepiv16RFeQWNA==
+
+tinypool@^0.8.3:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.8.4.tgz#e217fe1270d941b39e98c625dcecebb1408c9aa8"
+  integrity sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==
+
+tinyspy@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-2.2.1.tgz#117b2342f1f38a0dbdcc73a50a454883adf861d1"
+  integrity sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
@@ -7355,12 +5209,7 @@ toastr@^2.1.4:
   dependencies:
     jquery ">=1.12.0"
 
-totalist@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
-  integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
-
-tough-cookie@^4.1.2:
+tough-cookie@^4.1.3:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
   integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
@@ -7370,12 +5219,12 @@ tough-cookie@^4.1.2:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
-tr46@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
-  integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
+tr46@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.0.0.tgz#3b46d583613ec7283020d79019f1335723801cec"
+  integrity sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==
   dependencies:
-    punycode "^2.1.1"
+    punycode "^2.3.1"
 
 tr46@~0.0.3:
   version "0.0.3"
@@ -7387,57 +5236,21 @@ tree-kill@^1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-ts-jest@^29.1.1:
-  version "29.1.1"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.1.tgz#f58fe62c63caf7bfcc5cc6472082f79180f0815b"
-  integrity sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==
-  dependencies:
-    bs-logger "0.x"
-    fast-json-stable-stringify "2.x"
-    jest-util "^29.0.0"
-    json5 "^2.2.3"
-    lodash.memoize "4.x"
-    make-error "1.x"
-    semver "^7.5.3"
-    yargs-parser "^21.0.1"
-
-ts-loader@^9.4.4:
-  version "9.4.4"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.4.4.tgz#6ceaf4d58dcc6979f84125335904920884b7cee4"
-  integrity sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==
-  dependencies:
-    chalk "^4.1.0"
-    enhanced-resolve "^5.0.0"
-    micromatch "^4.0.0"
-    semver "^7.3.4"
-
-tsconfig@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7"
-  integrity sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==
-  dependencies:
-    "@types/strip-bom" "^3.0.0"
-    "@types/strip-json-comments" "0.0.30"
-    strip-bom "^3.0.0"
-    strip-json-comments "^2.0.0"
+ts-api-utils@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
+  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
-tslib@^1.8.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+tsconfck@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/tsconfck/-/tsconfck-3.0.3.tgz#d9bda0e87d05b1c360e996c9050473c7e6f8084f"
+  integrity sha512-4t0noZX9t6GcPTfBAbIbbIU4pfpCwh0ueq3S4O/5qXI1VwK1outmxhe9dOiEWqMz3MW2LKgDTpqWV+37IWuVbA==
 
 tslib@^2.1.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
 
-tsutils@^3.21.0:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -7452,7 +5265,7 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-detect@4.0.8:
+type-detect@^4.0.0, type-detect@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
@@ -7462,11 +5275,6 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-
 type@^1.0.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
@@ -7487,11 +5295,21 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+typescript@5.4.2:
+  version "5.4.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372"
+  integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==
+
 typescript@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
   integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
 
+ufo@^1.3.2:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.5.3.tgz#3325bd3c977b6c6cd3160bf4ff52989adc9d3344"
+  integrity sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==
+
 unbox-primitive@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
@@ -7502,24 +5320,6 @@ unbox-primitive@^1.0.0:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
-unicode-canonical-property-names-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
-  integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
-
-unicode-match-property-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
-  integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
-  dependencies:
-    unicode-canonical-property-names-ecmascript "^2.0.0"
-    unicode-property-aliases-ecmascript "^2.0.0"
-
-unicode-match-property-value-ecmascript@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
-  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
-
 unicode-properties@^1.2.2:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/unicode-properties/-/unicode-properties-1.3.1.tgz#cc642b6314bde2c691d65dd94cece09ed84f1282"
@@ -7528,11 +5328,6 @@ unicode-properties@^1.2.2:
     base64-js "^1.3.0"
     unicode-trie "^2.0.0"
 
-unicode-property-aliases-ecmascript@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
-  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
-
 unicode-trie@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-trie/-/unicode-trie-2.0.0.tgz#8fd8845696e2e14a8b67d78fa9e0dd2cad62fec8"
@@ -7541,6 +5336,11 @@ unicode-trie@^2.0.0:
     pako "^0.2.5"
     tiny-inflate "^1.0.0"
 
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
 universalify@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
@@ -7598,34 +5398,102 @@ v-tooltip@2.0.2:
     popper.js "^1.15.0"
     vue-resize "^0.4.5"
 
-v8-to-istanbul@^9.0.1:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265"
-  integrity sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.12"
-    "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^1.6.0"
+validator@^13.7.0:
+  version "13.11.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.11.0.tgz#23ab3fd59290c61248364eabf4067f04955fbb1b"
+  integrity sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==
 
 visibilityjs@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/visibilityjs/-/visibilityjs-2.0.2.tgz#d7c466e922024bb6c413d2136d5567e71f5fdc2f"
   integrity sha512-y5sN5oGvuXXcK6s8WupOymRcqEss7kusojpScRqkT+cTCIFjul+06uSMDPMByN9DIBv/sUUnvV8BplKjqelAfw==
 
-vue-demi@>=0.14.5:
+vite-node@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-1.5.0.tgz#7f74dadfecb15bca016c5ce5ef85e5cc4b82abf2"
+  integrity sha512-tV8h6gMj6vPzVCa7l+VGq9lwoJjW8Y79vst8QZZGiuRAfijU+EEWuc0kFpmndQrWhMMhet1jdSF+40KSZUqIIw==
+  dependencies:
+    cac "^6.7.14"
+    debug "^4.3.4"
+    pathe "^1.1.1"
+    picocolors "^1.0.0"
+    vite "^5.0.0"
+
+vite-plugin-dts@^3.8.3:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/vite-plugin-dts/-/vite-plugin-dts-3.8.3.tgz#0505bcd07897f06859d5fb8d4b6332022af90ba5"
+  integrity sha512-yRHiRosQw7MXdOhmcrVI+kRiB8YEShbSxnADNteK4eZGdEoyOkMHihvO5XOAVlOq8ng9sIqu8vVefDK1zcj3qw==
+  dependencies:
+    "@microsoft/api-extractor" "7.43.0"
+    "@rollup/pluginutils" "^5.1.0"
+    "@vue/language-core" "^1.8.27"
+    debug "^4.3.4"
+    kolorist "^1.8.0"
+    magic-string "^0.30.8"
+    vue-tsc "^1.8.27"
+
+vite-tsconfig-paths@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz#321f02e4b736a90ff62f9086467faf4e2da857a9"
+  integrity sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==
+  dependencies:
+    debug "^4.1.1"
+    globrex "^0.1.2"
+    tsconfck "^3.0.3"
+
+vite@^5.0.0, vite@^5.2.9:
+  version "5.2.9"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.9.tgz#cd9a356c6ff5f7456c09c5ce74068ffa8df743d9"
+  integrity sha512-uOQWfuZBlc6Y3W/DTuQ1Sr+oIXWvqljLvS881SVmAj00d5RdgShLcuXWxseWPd4HXwiYBFW/vXHfKFeqj9uQnw==
+  dependencies:
+    esbuild "^0.20.1"
+    postcss "^8.4.38"
+    rollup "^4.13.0"
+  optionalDependencies:
+    fsevents "~2.3.3"
+
+vitest-fetch-mock@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/vitest-fetch-mock/-/vitest-fetch-mock-0.2.2.tgz#f6849dcf7a8e862a509e1cee2fa3bb0cb534f468"
+  integrity sha512-XmH6QgTSjCWrqXoPREIdbj40T7i1xnGmAsTAgfckoO75W1IEHKR8hcPCQ7SO16RsdW1t85oUm6pcQRLeBgjVYQ==
+  dependencies:
+    cross-fetch "^3.0.6"
+
+vitest@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/vitest/-/vitest-1.5.0.tgz#6ebb396bd358650011a9c96c18fa614b668365c1"
+  integrity sha512-d8UKgR0m2kjdxDWX6911uwxout6GHS0XaGH1cksSIVVG8kRlE7G7aBw7myKQCvDI5dT4j7ZMa+l706BIORMDLw==
+  dependencies:
+    "@vitest/expect" "1.5.0"
+    "@vitest/runner" "1.5.0"
+    "@vitest/snapshot" "1.5.0"
+    "@vitest/spy" "1.5.0"
+    "@vitest/utils" "1.5.0"
+    acorn-walk "^8.3.2"
+    chai "^4.3.10"
+    debug "^4.3.4"
+    execa "^8.0.1"
+    local-pkg "^0.5.0"
+    magic-string "^0.30.5"
+    pathe "^1.1.1"
+    picocolors "^1.0.0"
+    std-env "^3.5.0"
+    strip-literal "^2.0.0"
+    tinybench "^2.5.1"
+    tinypool "^0.8.3"
+    vite "^5.0.0"
+    vite-node "1.5.0"
+    why-is-node-running "^2.2.2"
+
+vue-demi@>=0.14.5, vue-demi@>=0.14.7:
   version "0.14.7"
   resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.7.tgz#8317536b3ef74c5b09f268f7782e70194567d8f2"
   integrity sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==
 
-vue-demi@>=0.14.6:
-  version "0.14.6"
-  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.6.tgz#dc706582851dc1cdc17a0054f4fec2eb6df74c92"
-  integrity sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==
-
-vue-eslint-parser@^9.3.0:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.3.1.tgz#429955e041ae5371df5f9e37ebc29ba046496182"
-  integrity sha512-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g==
+vue-eslint-parser@^9.3.1, vue-eslint-parser@^9.4.2:
+  version "9.4.2"
+  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.4.2.tgz#02ffcce82042b082292f2d1672514615f0d95b6d"
+  integrity sha512-Ry9oiGmCAK91HrKMtCrKFWmSFWvYkpGglCeFAIqDdr9zdXmMMpJOmUJS7WWsW7fX81h6mwHmUZCQQ1E0PkSwYQ==
   dependencies:
     debug "^4.3.4"
     eslint-scope "^7.1.1"
@@ -7635,27 +5503,11 @@ vue-eslint-parser@^9.3.0:
     lodash "^4.17.21"
     semver "^7.3.6"
 
-vue-hot-reload-api@^2.3.0:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
-  integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
-
-vue-i18n@^8.15.4:
+vue-i18n@^8.28.2:
   version "8.28.2"
   resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.28.2.tgz#913558066e274395c0a9f40b2f3393d5c2636840"
   integrity sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA==
 
-vue-loader@^15.10.2:
-  version "15.10.2"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.10.2.tgz#6dccfda8661caa7f5415806a5e386fd3258d8112"
-  integrity sha512-ndeSe/8KQc/nlA7TJ+OBhv2qalmj1s+uBs7yHDRFaAXscFTApBzY9F1jES3bautmgWjDlDct0fw8rPuySDLwxw==
-  dependencies:
-    "@vue/component-compiler-utils" "^3.1.0"
-    hash-sum "^1.0.2"
-    loader-utils "^1.1.0"
-    vue-hot-reload-api "^2.3.0"
-    vue-style-loader "^4.1.0"
-
 vue-observe-visibility@^0.4.3:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz#878cb8ebcf3078e40807af29774e97105ebd519e"
@@ -7671,23 +5523,7 @@ vue-router@^3.6.5:
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.6.5.tgz#95847d52b9a7e3f1361cb605c8e6441f202afad8"
   integrity sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ==
 
-vue-style-loader@^4.1.0:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35"
-  integrity sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==
-  dependencies:
-    hash-sum "^1.0.2"
-    loader-utils "^1.0.2"
-
-vue-template-compiler@^2.7.14:
-  version "2.7.14"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz#4545b7dfb88090744c1577ae5ac3f964e61634b1"
-  integrity sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==
-  dependencies:
-    de-indent "^1.0.2"
-    he "^1.2.0"
-
-vue-template-compiler@^2.7.15:
+vue-template-compiler@^2.7.14, vue-template-compiler@^2.7.16:
   version "2.7.16"
   resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz#c81b2d47753264c77ac03b9966a46637482bb03b"
   integrity sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==
@@ -7695,19 +5531,14 @@ vue-template-compiler@^2.7.15:
     de-indent "^1.0.2"
     he "^1.2.0"
 
-vue-template-es2015-compiler@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
-  integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
-
-vue-tsc@^1.8.15:
-  version "1.8.15"
-  resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.8.15.tgz#e00faee4215b65e797efc29200ab9ad9432318df"
-  integrity sha512-4DoB3LUj7IToLmggoCxRiFG+QU5lem0nv03m1ocqugXA9rSVoTOEoYYaP8vu8b99Eh+/cCVdYOeIAQ+RsgUYUw==
+vue-tsc@^1.8.27:
+  version "1.8.27"
+  resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.8.27.tgz#feb2bb1eef9be28017bb9e95e2bbd1ebdd48481c"
+  integrity sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==
   dependencies:
-    "@vue/language-core" "1.8.15"
-    "@vue/typescript" "1.8.15"
-    semver "^7.3.8"
+    "@volar/typescript" "~1.11.1"
+    "@vue/language-core" "1.8.27"
+    semver "^7.5.4"
 
 vue-virtual-table@^0.2.22:
   version "0.2.22"
@@ -7718,12 +5549,7 @@ vue-virtual-table@^0.2.22:
     vue-observe-visibility "^0.4.3"
     vue-resize "^0.4.5"
 
-vue@^2.6.12:
-  version "2.6.14"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
-  integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==
-
-vue@^2.7.15:
+vue@^2.7.16:
   version "2.7.16"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.16.tgz#98c60de9def99c0e3da8dae59b304ead43b967c9"
   integrity sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==
@@ -7736,32 +5562,12 @@ w3c-keyname@^2.2.0:
   resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.6.tgz#8412046116bc16c5d73d4e612053ea10a189c85f"
   integrity sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==
 
-w3c-xmlserializer@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
-  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
-  dependencies:
-    xml-name-validator "^4.0.0"
-
-walker@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
-  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
-  dependencies:
-    makeerror "1.0.12"
-
-watchpack@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
-  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
+w3c-xmlserializer@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz#f925ba26855158594d907313cedd1476c5967f6c"
+  integrity sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==
   dependencies:
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.1.2"
-
-weakmap-polyfill@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/weakmap-polyfill/-/weakmap-polyfill-2.0.1.tgz#ff0278c7f75bb0c492fc3343257f3e87114d709a"
-  integrity sha512-Jy177Lvb1LCrPQDWJsXyyqf4eOhcdvQHFGoCqSv921kVF5i42MVbr4e2WEwetuTLBn1NX0IhPzTmMu0N3cURqQ==
+    xml-name-validator "^5.0.0"
 
 webidl-conversions@^3.0.0:
   version "3.0.1"
@@ -7773,108 +5579,24 @@ webidl-conversions@^7.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
-webpack-bundle-analyzer@^4.9.1:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.1.tgz#d00bbf3f17500c10985084f22f1a2bf45cb2f09d"
-  integrity sha512-jnd6EoYrf9yMxCyYDPj8eutJvtjQNp8PHmni/e/ulydHBWhT5J3menXt3HEkScsu9YqMAcG4CfFjs3rj5pVU1w==
-  dependencies:
-    "@discoveryjs/json-ext" "0.5.7"
-    acorn "^8.0.4"
-    acorn-walk "^8.0.0"
-    commander "^7.2.0"
-    escape-string-regexp "^4.0.0"
-    gzip-size "^6.0.0"
-    is-plain-object "^5.0.0"
-    lodash.debounce "^4.0.8"
-    lodash.escape "^4.0.1"
-    lodash.flatten "^4.4.0"
-    lodash.invokemap "^4.6.0"
-    lodash.pullall "^4.2.0"
-    lodash.uniqby "^4.7.0"
-    opener "^1.5.2"
-    picocolors "^1.0.0"
-    sirv "^2.0.3"
-    ws "^7.3.1"
-
-webpack-cli@^4.10.0:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31"
-  integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==
-  dependencies:
-    "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^1.2.0"
-    "@webpack-cli/info" "^1.5.0"
-    "@webpack-cli/serve" "^1.7.0"
-    colorette "^2.0.14"
-    commander "^7.0.0"
-    cross-spawn "^7.0.3"
-    fastest-levenshtein "^1.0.12"
-    import-local "^3.0.2"
-    interpret "^2.2.0"
-    rechoir "^0.7.0"
-    webpack-merge "^5.7.3"
-
-webpack-merge@^5.7.3:
-  version "5.8.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61"
-  integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
-  dependencies:
-    clone-deep "^4.0.1"
-    wildcard "^2.0.0"
-
-webpack-sources@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
-  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
-
-webpack@^5.89.0:
-  version "5.89.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.89.0.tgz#56b8bf9a34356e93a6625770006490bf3a7f32dc"
-  integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==
-  dependencies:
-    "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^1.0.0"
-    "@webassemblyjs/ast" "^1.11.5"
-    "@webassemblyjs/wasm-edit" "^1.11.5"
-    "@webassemblyjs/wasm-parser" "^1.11.5"
-    acorn "^8.7.1"
-    acorn-import-assertions "^1.9.0"
-    browserslist "^4.14.5"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.15.0"
-    es-module-lexer "^1.2.1"
-    eslint-scope "5.1.1"
-    events "^3.2.0"
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
-    json-parse-even-better-errors "^2.3.1"
-    loader-runner "^4.2.0"
-    mime-types "^2.1.27"
-    neo-async "^2.6.2"
-    schema-utils "^3.2.0"
-    tapable "^2.1.1"
-    terser-webpack-plugin "^5.3.7"
-    watchpack "^2.4.0"
-    webpack-sources "^3.2.3"
-
-whatwg-encoding@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
-  integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==
+whatwg-encoding@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz#d0f4ef769905d426e1688f3e34381a99b60b76e5"
+  integrity sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==
   dependencies:
     iconv-lite "0.6.3"
 
-whatwg-mimetype@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
-  integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
+whatwg-mimetype@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz#bc1bf94a985dc50388d54a9258ac405c3ca2fc0a"
+  integrity sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==
 
-whatwg-url@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
-  integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
+whatwg-url@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-14.0.0.tgz#00baaa7fd198744910c4b1ef68378f2200e4ceb6"
+  integrity sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==
   dependencies:
-    tr46 "^3.0.0"
+    tr46 "^5.0.0"
     webidl-conversions "^7.0.0"
 
 whatwg-url@^5.0.0:
@@ -7929,10 +5651,13 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wildcard@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
-  integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
+why-is-node-running@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/why-is-node-running/-/why-is-node-running-2.2.2.tgz#4185b2b4699117819e7154594271e7e344c9973e"
+  integrity sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==
+  dependencies:
+    siginfo "^2.0.0"
+    stackback "0.0.2"
 
 word-wrap@~1.2.3:
   version "1.2.4"
@@ -7962,29 +5687,21 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
-  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
-  dependencies:
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.7"
-
-ws@^7.3.1:
-  version "7.5.9"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
-  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
-
-ws@^8.11.0:
-  version "8.13.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
-  integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
+ws@^8.16.0:
+  version "8.16.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4"
+  integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==
 
 xml-name-validator@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
   integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
 
+xml-name-validator@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz#82be9b957f7afdacf961e5980f1bf227c0bf7673"
+  integrity sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==
+
 xmlchars@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
@@ -8035,7 +5752,7 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^21.0.1, yargs-parser@^21.1.1:
+yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
@@ -8057,7 +5774,7 @@ yargs@^15.3.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
-yargs@^17.3.1, yargs@^17.7.2:
+yargs@^17.7.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -8074,3 +5791,19 @@ yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+yocto-queue@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
+  integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
+
+z-schema@~5.0.2:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-5.0.6.tgz#46d6a687b15e4a4369e18d6cb1c7b8618fc256c5"
+  integrity sha512-+XR1GhnWklYdfr8YaZv/iu+vY+ux7V5DS5zH1DQf6bO5ufrt/5cgNhVO5qyhsjFXvsqQb/f08DWE9b6uPscyAg==
+  dependencies:
+    lodash.get "^4.4.2"
+    lodash.isequal "^4.5.0"
+    validator "^13.7.0"
+  optionalDependencies:
+    commander "^10.0.0"

From bc70be717c239966e8127fc508b903246c1b16ca Mon Sep 17 00:00:00 2001
From: Dmitriy Ovcharenko <ovcharenkodd@gmail.com>
Date: Tue, 11 Jun 2024 15:31:52 +1000
Subject: [PATCH 11/46] Release: 5.10.0b2

---
 package.json                                  |  2 +-
 vstutils/__init__.py                          |  2 +-
 vstutils/api/health.py                        |  5 --
 .../api/registration/email_confirmation.py    | 51 +++++++++++++++
 vstutils/api/registration/serializers.py      | 63 +++++--------------
 vstutils/api/registration/utils.py            | 10 +++
 vstutils/api/registration/views.py            |  2 +-
 vstutils/asgi.py                              |  2 +-
 8 files changed, 80 insertions(+), 57 deletions(-)
 create mode 100644 vstutils/api/registration/email_confirmation.py
 create mode 100644 vstutils/api/registration/utils.py

diff --git a/package.json b/package.json
index f15ba208..fd186de1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vstconsulting/vstutils",
-  "version": "5.10.0b1",
+  "version": "5.10.0b2",
   "type": "module",
   "author": "VST Consulting",
   "license": "Apache-2.0",
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 99cbee73..7e948d23 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b1'
+__version__: str = '5.10.0b2'
diff --git a/vstutils/api/health.py b/vstutils/api/health.py
index 914b59a4..e059a26c 100644
--- a/vstutils/api/health.py
+++ b/vstutils/api/health.py
@@ -88,8 +88,3 @@ def check_health_rpc(self):
             return "disabled"
         else:
             return self.celery_check(celery_app)
-
-    def check_health_session_engine(self):
-        # pylint: disable=pointless-statement
-        tuple(self.request.session.values())
-        self.request.user.is_active
diff --git a/vstutils/api/registration/email_confirmation.py b/vstutils/api/registration/email_confirmation.py
new file mode 100644
index 00000000..6c0dfff4
--- /dev/null
+++ b/vstutils/api/registration/email_confirmation.py
@@ -0,0 +1,51 @@
+from functools import partial
+
+from django.conf import settings
+from django.core.cache import cache
+from django.db import transaction
+from django.utils.module_loading import import_string
+from rest_framework import fields
+from rest_framework.exceptions import ValidationError
+from vstutils.api.serializers import BaseSerializer
+from vstutils.utils import translate as _
+
+from .utils import check_data, secure_pickle
+
+REGISTRATION_SERIALIZER = import_string(
+    settings.DEFAULT_REGISTRATION_VIEW_SERIALIZER_CLASS
+)
+
+
+class ConfirmEmailSerializer(BaseSerializer):
+    code = fields.CharField(write_only=True)
+
+    def get_saved_user_data(self, code: str):
+        data = cache.get(code)
+        if not data:
+            raise ValidationError(
+                {"code": [_("Confirmation code is invalid or expired.")]}
+            )
+        data = secure_pickle.loads(data)
+        if not check_data(data["email"], code):
+            raise ValidationError({"code": [_("Invalid registration email send.")]})
+        return data
+
+    def remove_saved_user_data(self, code: str):
+        cache.delete(code)
+
+    def create(self, validated_data):
+        code = validated_data["code"]
+        data = self.get_saved_user_data(code)
+
+        serializer = REGISTRATION_SERIALIZER(
+            data=data,
+            context=self.context,
+            skip_email_confirmation=True,
+        )
+        serializer.is_valid(raise_exception=True)
+        user = serializer.save()
+
+        transaction.on_commit(
+            partial(self.remove_saved_user_data, code),
+        )
+        return user
diff --git a/vstutils/api/registration/serializers.py b/vstutils/api/registration/serializers.py
index 4e05b834..6b0ee2e4 100644
--- a/vstutils/api/registration/serializers.py
+++ b/vstutils/api/registration/serializers.py
@@ -1,24 +1,19 @@
-from functools import partial
 import unicodedata
 
 from django.conf import settings
 from django.contrib.auth import get_user_model, password_validation
-from django.contrib.auth.hashers import check_password, make_password
+from django.contrib.auth.hashers import make_password
 from django.core.cache import cache
-from django.db import transaction
-from django.test import override_settings
 from rest_framework import fields
 from rest_framework.exceptions import ValidationError
 from vstutils.api.fields import PasswordField
 from vstutils.api.serializers import VSTSerializer
-from vstutils.utils import SecurePickling, send_template_email, lazy_translate as __, translate as _
+from vstutils.utils import lazy_translate as __
+from vstutils.utils import send_template_email
 
-User = get_user_model()
-secure_pickle = SecurePickling()
+from .utils import hash_data, secure_pickle
 
-override_setting_decorator = override_settings(PASSWORD_HASHERS=settings.REGISTRATION_HASHERS)
-hash_data = override_setting_decorator(make_password)
-check_data = override_setting_decorator(check_password)
+User = get_user_model()
 
 
 def unique_username_validator(value):
@@ -47,8 +42,12 @@ def to_internal_value(self, data):
 class UserRegistrationWithEmailConfirmationMixin(VSTSerializer):
     email_confirmation_required = fields.BooleanField(default=False, read_only=True)
 
+    def __init__(self, *args, skip_email_confirmation=False, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.skip_email_confirmation = skip_email_confirmation
+
     def is_email_confirmation_required(self, validated_data: dict):
-        return settings.SEND_CONFIRMATION_EMAIL
+        return settings.SEND_CONFIRMATION_EMAIL and not self.skip_email_confirmation
 
     def build_confirmation_url(self, code: str):
         return self.context["request"].build_absolute_uri(
@@ -65,19 +64,19 @@ def get_confirmation_email_context(self, code: str):
             ),
         }
 
-    def send_confirmation_email(self, validated_data):
-        code = hash_data(validated_data["email"])
-        cache.set(code, secure_pickle.dumps(validated_data))
+    def send_confirmation_email(self, data: dict):
+        code = hash_data(data["email"])
+        cache.set(code, secure_pickle.dumps(data))
         send_template_email(
             subject=__("Registration Confirmation."),
             template_name="registration/confirm_email.html",
-            email=validated_data["email"],
+            email=data["email"],
             context_data=self.get_confirmation_email_context(code),
         )
 
     def create(self, validated_data):
         if self.is_email_confirmation_required(validated_data):
-            self.send_confirmation_email(validated_data)
+            self.send_confirmation_email(self.initial_data)
             validated_data["email_confirmation_required"] = True
             return validated_data
         return super().create(validated_data)
@@ -103,35 +102,3 @@ class Meta:
 
     def validate_password(self, value: str):
         return make_password(value)
-
-
-class ConfirmEmailSerializer(VSTSerializer):
-    code = fields.CharField(write_only=True)
-
-    class Meta:
-        model = User
-        fields = [
-            "code",
-        ]
-
-    def get_saved_user_data(self, code: str):
-        data = cache.get(code)
-        if not data:
-            raise ValidationError({'code': [_("Confirmation code is invalid or expired.")]})
-        data = secure_pickle.loads(data)
-        if not check_data(data["email"], code):
-            raise ValidationError({'code': [_("Invalid registration email send.")]})
-        return data
-
-    def remove_saved_user_data(self, code: str):
-        cache.delete(code)
-
-    def create(self, validated_data):
-        code = validated_data["code"]
-        user = super().create(
-            self.get_saved_user_data(code)
-        )
-        transaction.on_commit(
-            partial(self.remove_saved_user_data, code),
-        )
-        return user
diff --git a/vstutils/api/registration/utils.py b/vstutils/api/registration/utils.py
new file mode 100644
index 00000000..d6dcf4c1
--- /dev/null
+++ b/vstutils/api/registration/utils.py
@@ -0,0 +1,10 @@
+from django.conf import settings
+from django.contrib.auth.hashers import check_password, make_password
+from django.test import override_settings
+from vstutils.utils import SecurePickling
+
+secure_pickle = SecurePickling()
+
+override_setting_decorator = override_settings(PASSWORD_HASHERS=settings.REGISTRATION_HASHERS)
+hash_data = override_setting_decorator(make_password)
+check_data = override_setting_decorator(check_password)
diff --git a/vstutils/api/registration/views.py b/vstutils/api/registration/views.py
index 3d495916..ffb25e59 100644
--- a/vstutils/api/registration/views.py
+++ b/vstutils/api/registration/views.py
@@ -5,7 +5,7 @@
 from rest_framework.throttling import AnonRateThrottle
 from vstutils.api.base import GenericViewSet
 
-from .serializers import ConfirmEmailSerializer
+from .email_confirmation import ConfirmEmailSerializer
 
 
 class RegistrationThrottle(AnonRateThrottle):
diff --git a/vstutils/asgi.py b/vstutils/asgi.py
index 5f5d9bec..389a15e0 100644
--- a/vstutils/asgi.py
+++ b/vstutils/asgi.py
@@ -99,7 +99,7 @@ async def api_live_check():
 async def add_server_timing_header(request: Request, call_next):
     start_time = time.monotonic()
     response = await call_next(request)
-    response.headers['Server-Timing'] = f'total;dur={round((time.monotonic()-start_time)*1000, 2)}'
+    response.headers['Server-Timing'] = f'full;dur={round((time.monotonic()-start_time)*1000, 2)}'
     return response
 
 if not settings.API_ONLY:

From eba0ffd5c93efa9a80a96ffe800459314eba149c Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Tue, 11 Jun 2024 16:27:29 -0700
Subject: [PATCH 12/46] Release 5.10.0b3

### Changelog:
* Chore(backend): Update dependencies, typing and docs translations.
---
 doc/locale/ru/LC_MESSAGES/backend.po | 560 ++-------------------------
 doc/locale/ru/LC_MESSAGES/config.po  | 273 +++++++++----
 requirements-prod.txt                |   2 +-
 requirements-rpc.txt                 |   2 +-
 requirements-rtd.txt                 |   4 +-
 requirements-stubs.txt               |   6 +-
 requirements-test.txt                |   2 +-
 requirements.txt                     |  10 +-
 vstutils/__init__.py                 |   2 +-
 vstutils/drivers/cache.py            |   4 +-
 10 files changed, 260 insertions(+), 605 deletions(-)

diff --git a/doc/locale/ru/LC_MESSAGES/backend.po b/doc/locale/ru/LC_MESSAGES/backend.po
index 9ca2a268..499f4402 100644
--- a/doc/locale/ru/LC_MESSAGES/backend.po
+++ b/doc/locale/ru/LC_MESSAGES/backend.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VST Utils 5.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-23 06:14+0000\n"
+"POT-Creation-Date: 2024-06-11 22:49+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -727,7 +727,6 @@ msgstr "is_sliced (bool): Булево значение, указывающее,
 #: vstutils.tests.BaseTestCase.assertCount
 #: vstutils.tests.BaseTestCase.assertRCode vstutils.tests.BaseTestCase.bulk
 #: vstutils.tests.BaseTestCase.bulk_transactional
-#: vstutils.tests.BaseTestCase.call_registration
 #: vstutils.tests.BaseTestCase.details_test
 #: vstutils.tests.BaseTestCase.endpoint_call
 #: vstutils.tests.BaseTestCase.endpoint_schema
@@ -745,10 +744,11 @@ msgstr "is_sliced (bool): Булево значение, указывающее,
 #: vstutils.utils.ModelHandlers.get_object vstutils.utils.ObjectHandlers
 #: vstutils.utils.ObjectHandlers.backend vstutils.utils.URLHandlers
 #: vstutils.utils.URLHandlers.get_object vstutils.utils.UnhandledExecutor
-#: vstutils.utils.classproperty vstutils.utils.create_view
-#: vstutils.utils.decode vstutils.utils.deprecated vstutils.utils.encode
-#: vstutils.utils.get_render vstutils.utils.lazy_translate
-#: vstutils.utils.list_to_choices vstutils.utils.send_template_email
+#: vstutils.utils.add_in_vary vstutils.utils.classproperty
+#: vstutils.utils.create_view vstutils.utils.decode vstutils.utils.deprecated
+#: vstutils.utils.encode vstutils.utils.get_render
+#: vstutils.utils.lazy_translate vstutils.utils.list_to_choices
+#: vstutils.utils.send_template_email
 #: vstutils.utils.send_template_email_handler vstutils.utils.tmp_file
 #: vstutils.utils.tmp_file.write vstutils.utils.translate
 msgid "Parameters"
@@ -1432,7 +1432,7 @@ msgstr "допустимое значение"
 
 #: of vstutils.api.fields.CrontabField:14
 msgid "minute"
-msgstr ""
+msgstr "минута"
 
 #: of vstutils.api.fields.CrontabField:14
 msgid "0-59"
@@ -1440,7 +1440,7 @@ msgstr "0-59"
 
 #: of vstutils.api.fields.CrontabField:15
 msgid "hour"
-msgstr ""
+msgstr "час"
 
 #: of vstutils.api.fields.CrontabField:15
 msgid "0-23"
@@ -1448,7 +1448,7 @@ msgstr "0-23"
 
 #: of vstutils.api.fields.CrontabField:16
 msgid "day of month"
-msgstr ""
+msgstr "день месяца"
 
 #: of vstutils.api.fields.CrontabField:16
 msgid "1-31"
@@ -1456,7 +1456,7 @@ msgstr "1-31"
 
 #: of vstutils.api.fields.CrontabField:17
 msgid "month"
-msgstr ""
+msgstr "месяц"
 
 #: of vstutils.api.fields.CrontabField:17
 msgid "1-12"
@@ -1464,7 +1464,7 @@ msgstr "1-12"
 
 #: of vstutils.api.fields.CrontabField:18
 msgid "day of week"
-msgstr ""
+msgstr "день недели"
 
 #: of vstutils.api.fields.CrontabField:18
 msgid "0-7 (0 or 7 is Sunday)"
@@ -2619,17 +2619,16 @@ msgid ""
 msgstr ""
 "Поле, расширяющее :class:`.FileInStringField`, но скрывающее свое "
 "значение в интерфейсе администратора."
-
 #: of vstutils.api.fields.TextareaField:1
 msgid "A specialized field that allows the input and display of multiline text."
-msgstr ""
+msgstr "Специализированное поле, которое позволяет вводить и отображать многострочный текст."
 
 #: of vstutils.api.fields.TextareaField:8
 msgid ""
 "Suppose you have a model with a `description` field that can contain "
 "multiline text. You can use `TextareaField` in your serializer to enable "
 "users to input and view multiline text in the GUI:"
-msgstr ""
+msgstr "Предположим, у вас есть модель с полем `description`, которое может содержать многострочный текст. Вы можете использовать `TextareaField` в вашем сериализаторе, чтобы пользователи могли вводить и просматривать многострочный текст в графическом интерфейсе:"
 
 #: of vstutils.api.fields.UptimeField:1
 msgid ""
@@ -2659,19 +2658,19 @@ msgstr ""
 
 #: of vstutils.api.fields.UptimeField:9
 msgid "``HH:mm:ss`` (e.g., 23:59:59)"
-msgstr ""
+msgstr "``HH:mm:ss`` (например, 23:59:59)"
 
 #: of vstutils.api.fields.UptimeField:10
 msgid "``dd HH:mm:ss`` (e.g., 01d 00:00:00)"
-msgstr ""
+msgstr "``dd HH:mm:ss`` (например, 01d 00:00:00)"
 
 #: of vstutils.api.fields.UptimeField:11
 msgid "``mm dd HH:mm:ss`` (e.g., 01m 30d 00:00:00)"
-msgstr ""
+msgstr "``mm dd HH:mm:ss`` (например, 01m 30d 00:00:00)"
 
 #: of vstutils.api.fields.UptimeField:12
 msgid "``yy mm dd HH:mm:ss`` (e.g., 99y 11m 30d 22:23:24)"
-msgstr ""
+msgstr "``yy mm dd HH:mm:ss`` (например, 99y 11m 30d 22:23:24)"
 
 #: of vstutils.api.fields.UptimeField:21
 msgid ""
@@ -3966,11 +3965,14 @@ msgid ""
 msgstr ""
 "При назначении действия на объект список методов также заполняется "
 "необходимыми методами."
+
 #: of vstutils.api.actions.SimpleFileAction:1
 msgid ""
 "Action for handling file responses. This action always returns a "
 "FileResponse."
-msgstr "Экшен для обработки ответов с файлами. Это действие всегда возвращает FileResponse."
+msgstr ""
+"Экшен для обработки ответов с файлами. Это действие всегда возвращает "
+"FileResponse."
 
 #: of vstutils.api.actions.SimpleFileAction:3
 msgid ""
@@ -3978,7 +3980,12 @@ msgid ""
 "return file responses. It ensures that the file is only sent if it has "
 "been modified since the client's last request, and it sets appropriate "
 "headers to facilitate caching and attachment handling."
-msgstr "Этот класс предназначен для упрощения процесса создания действий, возвращающих ответы с файлами. Он гарантирует, что файл отправляется только в случае его изменения с момента последнего запроса клиента, и устанавливает соответствующие заголовки для облегчения кэширования и обработки вложений."
+msgstr ""
+"Этот класс предназначен для упрощения процесса создания действий, "
+"возвращающих ответы с файлами. Он гарантирует, что файл отправляется "
+"только в случае его изменения с момента последнего запроса клиента, и "
+"устанавливает соответствующие заголовки для облегчения кэширования и "
+"обработки вложений."
 
 #: of vstutils.api.actions.SimpleFileAction:62
 msgid "Cache-Control header value. Defaults to 'max-age=3600'."
@@ -3988,14 +3995,19 @@ msgstr "Значение заголовка Cache-Control. По умолчани
 msgid ""
 "Boolean indicating if the file should be sent as an attachment. Defaults "
 "to False."
-msgstr "Булево значение, указывающее, следует ли отправлять файл в виде вложения. По умолчанию False."
+msgstr ""
+"Булево значение, указывающее, следует ли отправлять файл в виде вложения."
+" По умолчанию False."
 
 #: of vstutils.api.actions.SimpleFileAction:66
 msgid "Additional named arguments for :func:`rest_framework.decorators.action`."
 msgstr "Набор именованных аргументов для :func:`rest_framework.decorators.action`."
+
 #: of vstutils.api.actions.SimpleFileAction.modified_since:1
 msgid "Default modified_since method that checks the modification time of a file."
-msgstr "Метод modified_since по умолчанию, который проверяет время изменения файла."
+msgstr ""
+"Метод modified_since по умолчанию, который проверяет время изменения "
+"файла."
 
 #: of vstutils.api.actions.SimpleFileAction.modified_since:4
 #: vstutils.api.actions.SimpleFileAction.pre_data:4
@@ -4013,7 +4025,9 @@ msgstr "Время изменения файла или None, если оно н
 
 #: of vstutils.api.actions.SimpleFileAction.pre_data:1
 msgid "Default pre_data method that returns the file, its name, and content type."
-msgstr "Метод pre_data по умолчанию, который возвращает файл, его имя и тип содержимого."
+msgstr ""
+"Метод pre_data по умолчанию, который возвращает файл, его имя и тип "
+"содержимого."
 
 #: of vstutils.api.actions.SimpleFileAction.pre_data:8
 msgid "A tuple containing the file, its name, and its content type."
@@ -5009,20 +5023,6 @@ msgstr ""
 "Делает транзакционный bulk-запрос и проверяет код состояния (200 по "
 "умолчанию)"
 
-#: of vstutils.tests.BaseTestCase.call_registration:1
-msgid "Function for calling registration. Just got form data and headers."
-msgstr ""
-"Функция для вызова регистрации. Просто передайте данные формы вместе с "
-"заголовками."
-
-#: of vstutils.tests.BaseTestCase.call_registration:4
-msgid "Registration form data."
-msgstr "Данные регистрации с формы."
-
-#: of vstutils.tests.BaseTestCase.call_registration:7
-msgid "named arguments with request headers."
-msgstr "именованные аргументы вместе с заголовками запроса."
-
 #: of vstutils.tests.BaseTestCase.details_test:1
 msgid ""
 "Test for get details of model. If you setup additional named arguments, "
@@ -5616,6 +5616,10 @@ msgstr ""
 "Класс, основанный на :class:`.Executor`, но с выключенным "
 "`working_handler`."
 
+#: of vstutils.utils.add_in_vary:1
+msgid "Adds provided value to Vary header if not added already"
+msgstr "Добавляет указанное значение в заголовок Vary, если оно еще не добавлено"
+
 #: of vstutils.utils.apply_decorators:1
 msgid "Decorator which apply list of decorators on method or class."
 msgstr "Декоратор, оборачивающий метод или класс в список декораторов."
@@ -6064,485 +6068,3 @@ msgid ""
 msgstr ""
 "``VE100`` - Код ошибки целостности. Используется при появляении "
 "``django.db.utils.IntegrityError``."
-
-#~ msgid "prefetch values on frontend at list-view. Default is ``False``."
-#~ msgstr ""
-#~ "делает prefetch значений на фронтенде в"
-#~ " list-view. По умолчанию ``False``."
-
-#~ msgid ""
-#~ "Dictionary, where keys are name of "
-#~ "field from the same model, and "
-#~ "values are name of query filter. "
-#~ "If at least one of the fields "
-#~ "that we depend on is non nullable,"
-#~ " required and set to null, "
-#~ "autocompletion list will be empty and"
-#~ " field will be disabled."
-#~ msgstr ""
-#~ "Словарь, где ключи - это имена "
-#~ "полей из той же модели, а значения"
-#~ " - названия query-фильтров. Если хотя "
-#~ "бы одно из полей, от которых "
-#~ "существует зависимость не допускает null, "
-#~ "обязательно или установлено в null, "
-#~ "список автодополнения будет пустым, а "
-#~ "поле окажется выключенным."
-
-#~ msgid ""
-#~ "Field which type is based on "
-#~ "another field. It converts value to "
-#~ "internal string and represent field as"
-#~ " json object."
-#~ msgstr ""
-#~ "Поле, тип которого зависит от другого"
-#~ " поля. Хранит значение в виде строки,"
-#~ " а отображает поле в виде объекта "
-#~ "json."
-
-#~ msgid ""
-#~ "Allows to use parent views data as"
-#~ " source for field creation. Exact "
-#~ "view path (`/user/{id}/`) or relative "
-#~ "parent specifier (`<<parent>>.<<parent>>.<<parent>>`) "
-#~ "can be provided. For example if "
-#~ "current page is `/user/1/role/2/` and "
-#~ "`source_view` is `<<parent>>.<<parent>>` then "
-#~ "data from `/user/1/` will be used. "
-#~ "Only detail views if supported."
-#~ msgstr ""
-#~ "Позволяет использовать данные родительских "
-#~ "view в качестве источника для создания"
-#~ " полей. Можно указать точный путь "
-#~ "представления (`/user/{id}/`) или относительный "
-#~ "спецификатор родительского представления "
-#~ "(`<<parent>>.<<parent>>.<<parent>>`). Например, если "
-#~ "текущая страница - `/user/1/role/2/`, а "
-#~ "`source_view` - `<<parent>>.<<parent>>`, то "
-#~ "будут использованы данные из `/user/1/`. "
-#~ "Поддерживаются только представления деталей."
-
-#~ msgid ""
-#~ "Effective only in GUI. In API "
-#~ "works similar to :class:`.VSTCharField` "
-#~ "without value modifications."
-#~ msgstr ""
-#~ "Действует только в графическом интерфейсе. "
-#~ "В API работает аналогично "
-#~ ":class:`.VSTCharField` без изменения значения."
-
-#~ msgid ""
-#~ "A versatile field in Django Rest "
-#~ "Framework that dynamically adapts its "
-#~ "type based on the value of another"
-#~ " field in the model. It facilitates"
-#~ " complex scenarios where the type of"
-#~ " data to be serialized depends on "
-#~ "the value of a related field."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Example: Suppose you have a serializer"
-#~ " `MySerializer` with a `field_type` (e.g.,"
-#~ " a `ChoiceField`) and a corresponding "
-#~ "`object_data`. The `object_data` field can "
-#~ "have different types based on the "
-#~ "value of `field_type`. Here's an example"
-#~ " configuration:"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Field extends :class:`DynamicJsonTypeField`. "
-#~ "Validates field data by "
-#~ ":attr:`.field_attribute` chosen in related "
-#~ "model. By default, any value of "
-#~ ":attr:`.field_attribute` validates as "
-#~ ":class:`.VSTCharField`. To override this "
-#~ "behavior set dict attribute ``{field_attribute"
-#~ " value}_fields_mapping`` in related model "
-#~ "where:"
-#~ msgstr ""
-#~ "Поле, расширяющее :class:`DynamicJsonTypeField`. "
-#~ "Валидирует данные поля с помощью "
-#~ ":attr:`.field_attribute`, выбранного в связанной "
-#~ "модели. По умолчанию любое значение "
-#~ ":attr:`.field_attribute` валидируется классом "
-#~ ":class:`.VSTCharField`. Чтобы переопределить это "
-#~ "поведение, установите словарный атрибут "
-#~ "``{field_attribute value}_fields_mapping`` в "
-#~ "связанной модели, где:"
-
-#~ msgid ""
-#~ "**key** - string representation of value"
-#~ " type which is received from related"
-#~ " instance :attr:`.field_attribute`."
-#~ msgstr ""
-#~ "**key** - строковое представление типа "
-#~ "значения, получаемое от связанной модели "
-#~ ":attr:`.field_attribute`."
-
-#~ msgid "**value** - :class:`rest_framework.Field` instance for validation."
-#~ msgstr "**value** - экземпляр :class:`rest_framework.Field` для валидации."
-
-#~ msgid "Field containing multiline string."
-#~ msgstr "Поле, содержащее многострочный текст."
-
-#~ msgid ""
-#~ "Field contains html text and marked "
-#~ "as format:html. The field does not "
-#~ "validate whether its content is HTML."
-#~ msgstr ""
-#~ "Поле, содержащее текст html и помеченное"
-#~ " как format:html. Это поле не "
-#~ "проверяет, является ли его содержимое "
-#~ "валидным HTML."
-
-#~ msgid ""
-#~ "To avoid vulnerability, do not allow "
-#~ "users to modify this data because "
-#~ "users ate able to execute their "
-#~ "scripts."
-#~ msgstr ""
-#~ "Чтобы избежать уязвимости, не позволяйте "
-#~ "пользователям изменять эти данные, так "
-#~ "как они могут выполнить нежелательный "
-#~ "скрипт."
-
-#~ msgid ""
-#~ "Simple string field. Value must always"
-#~ " be a valid ASCII-string. The "
-#~ "field is going to represent as "
-#~ "Barcode (Code 128) in user interface."
-#~ msgstr ""
-#~ "Простое строковое поле. Значение всегда "
-#~ "должно быть допустимой строкой ASCII. В"
-#~ " пользовательском интерфейсе оно будет "
-#~ "отображено как штрихкод (код 128)."
-
-#~ msgid ""
-#~ "Simple string field. The field is "
-#~ "going to represent as QrCode in "
-#~ "user interface."
-#~ msgstr ""
-#~ "Простое строковое поле. В пользовательском "
-#~ "интерфейсе оно будет отображено как "
-#~ "QR-код."
-
-#~ msgid "warning"
-#~ msgstr "предупреждение"
-
-#~ msgid ""
-#~ "Exercise caution when using this field,"
-#~ " as it does not validate whether "
-#~ "the content is valid HTML. Be "
-#~ "aware of the potential security risks"
-#~ " associated with allowing users to "
-#~ "modify HTML content, as they may "
-#~ "execute scripts."
-#~ msgstr ""
-#~ "Будьте осторожны при использовании этого "
-#~ "поля, так как оно не проверяет, "
-#~ "является ли контент допустимым HTML. "
-#~ "Будьте в курсе потенциальных рисков "
-#~ "безопасности, связанных с разрешением "
-#~ "пользователям изменять HTML-контент, так как"
-#~ " они могут выполнять сценарии."
-
-#~ msgid "note"
-#~ msgstr "None"
-
-#~ msgid "show value as link to model. Default is ``True``."
-#~ msgstr "Отображает значение как ссылку на модель. По умолчанию ``True``."
-
-#~ msgid ""
-#~ "dictionary, where keys are names of "
-#~ "a field from the same model, and"
-#~ " values are names of query filter."
-#~ " If at least one of the fields"
-#~ " that we depend on is non "
-#~ "nullable, required and set to null, "
-#~ "autocompletion list will be empty and"
-#~ " field will be disabled."
-#~ msgstr ""
-#~ "словарь, где ключи - это имена "
-#~ "полей из той же модели, а значения"
-#~ " - названия query-фильтров. Если хотя "
-#~ "бы одно из полей, от которых "
-#~ "существует зависимость не допускает null, "
-#~ "обязательно или установлено в null, "
-#~ "список автодополнения будет пустым, а "
-#~ "поле окажется выключенным."
-
-#~ msgid ""
-#~ "This field does not support "
-#~ "``dependence``. Use ``filters`` at your "
-#~ "own risk, as it would rather break"
-#~ " the tree structure."
-#~ msgstr ""
-#~ "Это поле не поддерживает ``dependence``. "
-#~ "Используйте ``filters`` на свой страх и"
-#~ " риск, так как они могут сломать "
-#~ "структуру дерева."
-
-#~ msgid ""
-#~ "if True then only allows a value"
-#~ " to be selected if it has no"
-#~ " children. Default is `False`"
-#~ msgstr ""
-#~ "если True, то допускает к выбору "
-#~ "только то значение, которое не имеет "
-#~ "дочерних элементов. По умолчанию `False`"
-
-#~ msgid "name of parent field in model. Default is `parent`"
-#~ msgstr "название родительского поля в модели. По умолчанию `parent`"
-
-#~ msgid ""
-#~ "Field that takes JSON with properties:"
-#~ " * name - string - name of "
-#~ "file; * mediaType - string - MIME"
-#~ " type of file; * content - "
-#~ "base64 string - content of file."
-#~ msgstr ""
-#~ "Поле, принимающее на вход JSON со "
-#~ "следующими свойствами: * name - string"
-#~ " - имя файла; * mediaType - "
-#~ "string - MIME-тип файла; * content "
-#~ "- base64 string - содержимое файла."
-
-#~ msgid "Effective only in GUI. Works similar to :class:`.VSTCharField` in API."
-#~ msgstr ""
-#~ "Действует только в графическом интерфейсе. "
-#~ "Работает аналогично :class:`.VSTCharField` в "
-#~ "API."
-
-#~ msgid "**Attributes:**"
-#~ msgstr "**Атрибуты**:"
-
-#~ msgid ":attr:`bool file`: If True, accept only subclasses of File as input."
-#~ msgstr ""
-#~ ":attr:`bool file`: Если True, принимает "
-#~ "только подклассы File в качестве входных"
-#~ " данных."
-
-#~ msgid "If False, accept only string input. Default: False."
-#~ msgstr ""
-#~ "Если False, принимает только строковые "
-#~ "входные данные. По умолчанию: False."
-
-#~ msgid "Максимально допустимый размер содержимого файла в байтах."
-#~ msgstr "Максимально допустимый размер содержимого файла в байтах."
-
-#~ msgid "Минимально допустимый размер содержимого файла в байтах."
-#~ msgstr "Минимально допустимый размер содержимого файла в байтах."
-
-#~ msgid "Минимальная длина имени файла. Применяется только при ``file=True``."
-#~ msgstr "Минимальная длина имени файла. Применяется только при ``file=True``."
-
-#~ msgid "Максимальная длина имени файла. Применяется только при ``file=True``."
-#~ msgstr "Максимальная длина имени файла. Применяется только при ``file=True``."
-
-#~ msgid ""
-#~ "Extends :class:`.NamedBinaryFileInJsonField` to "
-#~ "represent image on frontend (if binary"
-#~ " image is valid). Validate this field"
-#~ " with :class:`vstutils.api.validators.ImageValidator`."
-#~ msgstr ""
-#~ "Расширяет :class:`.NamedBinaryFileInJsonField` для "
-#~ "view изображения на фронтенде (если "
-#~ "бинарное изображение валидно). Валидируйте это"
-#~ " поле с помощью "
-#~ ":class:`vstutils.api.validators.ImageValidator`."
-
-#~ msgid "**name** (str): Имя файла изображения."
-#~ msgstr "**name** (str): Имя файла."
-
-#~ msgid "**mediaType** (str): MIME-тип файла изображения."
-#~ msgstr "**mediaType** (str): MIME-тип файла."
-
-#~ msgid ""
-#~ "**content** (str or File): Содержимое "
-#~ "файла изображения. Если `file` установлен "
-#~ "в True, это будет ссылка на файл"
-#~ " изображения; в противном случае содержимое"
-#~ " будет закодировано в формате base64."
-#~ msgstr ""
-#~ "**content** (str или File): Содержимое "
-#~ "файла. Если `file` установлен в True,"
-#~ " это будет ссылка на файл "
-#~ "изображения; в противном случае содержимое "
-#~ "будет закодировано в формате base64."
-
-#~ msgid "`IMask <https://imask.js.org/guide.html>`_"
-#~ msgstr "`IMask <https://imask.js.org/guide.html>`_"
-
-#~ msgid "Effective only on frontend."
-#~ msgstr "Действует только на фронтенде."
-
-#~ msgid ""
-#~ "Default serializer with logic to work"
-#~ " with objects. Read more in `DRF "
-#~ "serializer's documentation <https://www.django-"
-#~ "rest-framework.org/api-guide/serializers/#serializers>`_ "
-#~ "how to create Serializers and work "
-#~ "with them."
-#~ msgstr ""
-#~ "Стандартный сериализатор с логикой работы "
-#~ "с объектами. Читайте подробнее в "
-#~ "`документации сериализатора <https://www.django-"
-#~ "rest-framework.org/api-guide/serializers/#serializers>`_ "
-#~ "как создавать сериализаторы и работать с"
-#~ " ними."
-
-#~ msgid ""
-#~ "Collection of Models: When model_class "
-#~ "is a collection, the function computes"
-#~ " an ETag by concatenating ETag values"
-#~ " of individual models in the "
-#~ "collection, using a recursive call for"
-#~ " each model. The ETag value for "
-#~ "each model is encoded and hashed "
-#~ "using Blake2s algorithm."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Model with get_etag_value Method: If the"
-#~ " model class has a get_etag_value "
-#~ "method, the function calls this method"
-#~ " to obtain a base ETag value. "
-#~ "It then appends language, user ID, "
-#~ "and session key information if they "
-#~ "are marked as dependencies in the "
-#~ "model's ``_cache_response_dependencies`` attribute. "
-#~ "This base ETag may be further "
-#~ "processed to include the application's "
-#~ "full version string and hashed if "
-#~ "user or session information is included."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Model without get_etag_value Method: For "
-#~ "models lacking a custom get_etag_value "
-#~ "method, the function generates an ETag"
-#~ " based on the model's class name "
-#~ "and a hash of the application's "
-#~ "full version string."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "A function to compare the ETags. "
-#~ "By default, this is set to "
-#~ "str.__eq__, which checks for an exact"
-#~ " match between the client's and "
-#~ "server's ETags, suitable for validating "
-#~ "caches with If-None-Match. To "
-#~ "handle If-Match scenarios, where the "
-#~ "operation should proceed only if the "
-#~ "ETags do not match, indicating the "
-#~ "resource has been modified, str.__ne__ "
-#~ "(not equal) can be used as the "
-#~ "operation handler. This flexibility allows "
-#~ "for precise control over how and "
-#~ "when clients are allowed to read "
-#~ "from or write to resources based "
-#~ "on their version."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "A function to compare the ETags. "
-#~ "By default, this is set to "
-#~ ":method:`str.__eq__`, which checks for an "
-#~ "exact match between the client's and "
-#~ "server's ETags, suitable for validating "
-#~ "caches with If-None-Match. To "
-#~ "handle If-Match scenarios, where the "
-#~ "operation should proceed only if the "
-#~ "ETags do not match, indicating the "
-#~ "resource has been modified, "
-#~ ":method:`str.__ne__` (not equal) can be "
-#~ "used as the operation handler. This "
-#~ "flexibility allows for precise control "
-#~ "over how and when clients are "
-#~ "allowed to read from or write to"
-#~ " resources based on their version."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "A function to compare the ETags. "
-#~ "By default, this is set to "
-#~ ":method:`str.__eq__`, which checks for an "
-#~ "exact match between the client's and "
-#~ "server's ETags, suitable for validating "
-#~ "caches with ``If-None-Match``. To "
-#~ "handle ``If-Match`` scenarios, where the"
-#~ " operation should proceed only if the"
-#~ " ETags do not match, indicating the"
-#~ " resource has been modified, "
-#~ ":method:`str.__ne__` (not equal) can be "
-#~ "used as the operation handler. This "
-#~ "flexibility allows for precise control "
-#~ "over how and when clients are "
-#~ "allowed to read from or write to"
-#~ " resources based on their version."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "A function to compare the ETags. "
-#~ "By default, this is set to "
-#~ "`str.__eq__`, which checks for an exact"
-#~ " match between the client's and "
-#~ "server's ETags, suitable for validating "
-#~ "caches with ``If-None-Match``. To "
-#~ "handle ``If-Match`` scenarios, where the"
-#~ " operation should proceed only if the"
-#~ " ETags do not match, indicating the"
-#~ " resource has been modified, `str.__ne__`"
-#~ " (not equal) can be used as the"
-#~ " operation handler. This flexibility allows"
-#~ " for precise control over how and "
-#~ "when clients are allowed to read "
-#~ "from or write to resources based "
-#~ "on their version."
-#~ msgstr ""
-
-#~ msgid "Default ViewSets for web-api."
-#~ msgstr "Стандартные ViewSet'ы для web-api."
-
-#~ msgid ""
-#~ "Mixin which cache GET responses. Uses"
-#~ " standard HTTP-caching mechanism which "
-#~ "response 304 when Etag match."
-#~ msgstr ""
-#~ "Миксина, кэширующяя ответы GET. Использует "
-#~ "стандартный механизм кэширования HTTP, который"
-#~ " отвечает 304, когда Etag совпадает."
-
-#~ msgid "This works only with models based on :class:`vstutils.models.BModel`."
-#~ msgstr ""
-#~ "Это работает только с моделями на "
-#~ "основе :class:`vstutils.models.BModel`."
-
-#~ msgid ""
-#~ "The mixin relies on `.get_etag_value` "
-#~ "and `.check_request_etag` functions within the"
-#~ " `GenericViewSet` context to dynamically "
-#~ "generate and validate ETags for resource"
-#~ " states. By comparing ETags, it "
-#~ "determines whether content has changed "
-#~ "since the last request, allowing clients"
-#~ " to reuse cached responses when "
-#~ "applicable and preventing concurrent write "
-#~ "operations from overwriting each other "
-#~ "without acknowledgment of updated state."
-#~ msgstr ""
-
-#~ msgid ""
-#~ "For effective use, ensure model classes"
-#~ " are compatible with ETag generation "
-#~ "and validation by implementing the "
-#~ "`.get_etag_value` method for custom ETag "
-#~ "computation. Additionally, the `.GenericViewSet` "
-#~ "using this mixin should properly handle"
-#~ " ETag headers in client requests to"
-#~ " leverage HTTP caching."
-#~ msgstr ""
-
diff --git a/doc/locale/ru/LC_MESSAGES/config.po b/doc/locale/ru/LC_MESSAGES/config.po
index 7a059dd8..736d0996 100644
--- a/doc/locale/ru/LC_MESSAGES/config.po
+++ b/doc/locale/ru/LC_MESSAGES/config.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VST Utils 5.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-01 04:55+0000\n"
+"POT-Creation-Date: 2024-06-11 22:49+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.14.0\n"
+"Generated-By: Babel 2.15.0\n"
 
 #: ../../config.rst:2
 msgid "Configuration manual"
@@ -1614,11 +1614,12 @@ msgid ""
 "notifications settings on user page will be hidden and `send` method of "
 "notification class will do nothing."
 msgstr ""
-"**enabled**: Булевый флаг, который включает или отключает веб-уведомления."
-" Установите `true`, чтобы активировать веб-уведомления, и `false`, чтобы "
-"деактивировать их. По умолчанию: `false`. Если установлено значение false, "
-"то настройки уведомлений на странице пользователя будут скрыты, и метод "
-"`send` класса уведомлений ничего не будет делать."
+"**enabled**: Булевый флаг, который включает или отключает "
+"веб-уведомления. Установите `true`, чтобы активировать веб-уведомления, и"
+" `false`, чтобы деактивировать их. По умолчанию: `false`. Если "
+"установлено значение false, то настройки уведомлений на странице "
+"пользователя будут скрыты, и метод `send` класса уведомлений ничего не "
+"будет делать."
 
 #: ../../config.rst:584
 msgid ""
@@ -1631,13 +1632,14 @@ msgid ""
 "`Creating VAPID Keys <https://web.dev/articles/push-notifications-"
 "subscribing-a-user#how_to_create_application_server_keys>`_."
 msgstr ""
-"**vapid_private_key**, **vapid_public_key**: Это ключи сервера приложений, "
-"используемые для отправки push-уведомлений. Ключи VAPID (Voluntary "
-"Application Server Identification) состоят из публичного и приватного "
-"ключей. Эти ключи являются необходимыми для безопасной связи между вашим "
-"сервером и службой push. Для генерации пары ключей VAPID и понимания их "
-"использования смотрите подробное руководство, доступное здесь: `Создание "
-"ключей VAPID <https://web.dev/articles/push-notifications-"
+"**vapid_private_key**, **vapid_public_key**: Это ключи сервера "
+"приложений, используемые для отправки push-уведомлений. Ключи VAPID "
+"(Voluntary Application Server Identification) состоят из публичного и "
+"приватного ключей. Эти ключи являются необходимыми для безопасной связи "
+"между вашим сервером и службой push. Для генерации пары ключей VAPID и "
+"понимания их использования смотрите подробное руководство, доступное "
+"здесь: `Создание ключей VAPID <https://web.dev/articles/push-"
+"notifications-"
 "subscribing-a-user#how_to_create_application_server_keys>`_."
 
 #: ../../config.rst:586
@@ -1662,11 +1664,12 @@ msgid ""
 "display-a-notification#icon>`_."
 msgstr ""
 "**default_notification_icon**: URL изображения иконки по умолчанию, "
-"которая будет использоваться для веб-уведомлений. Для избежания "
-"путаницы предпочтительно использовать абсолютный URL. Эта иконка будет "
-"отображаться в уведомлениях, если на уровне уведомления не указана другая "
-"иконка. Более подробную информацию об иконке можно найти `здесь <https://"
-"web.dev/articles/push-notifications-display-a-notification#icon>`_."
+"которая будет использоваться для веб-уведомлений. Для избежания путаницы "
+"предпочтительно использовать абсолютный URL. Эта иконка будет "
+"отображаться в уведомлениях, если на уровне уведомления не указана другая"
+" иконка. Более подробную информацию об иконке можно найти `здесь "
+"<https://web.dev/articles/push-notifications-"
+"display-a-notification#icon>`_."
 
 #: ../../config.rst:590
 msgid ""
@@ -1674,8 +1677,8 @@ msgid ""
 "notifications in VSTUtils, refer to the Web Push manual provided "
 ":ref:`here<webpush-manual>`."
 msgstr ""
-"Для более подробного руководства по использованию и реализации веб-"
-"уведомлений в VSTUtils смотрите руководство по веб-уведомлениям, "
+"Для более подробного руководства по использованию и реализации "
+"веб-уведомлений в VSTUtils смотрите руководство по веб-уведомлениям, "
 ":ref:`here<webpush-manual>`."
 
 #: ../../config.rst:592
@@ -1689,14 +1692,144 @@ msgstr ""
 "настроены правильно для оптимальной производительности."
 
 #: ../../config.rst:596
+msgid "OAuth 2 settings"
+msgstr "Настройки OAuth 2"
+
+#: ../../config.rst:598
+msgid "Section ``[oauth]``."
+msgstr "Раздел ``[oauth]``."
+
+#: ../../config.rst:602
+msgid "**server_url**: URL of OAuth2 server."
+msgstr "**server_url**: URL сервера OAuth2."
+
+#: ../../config.rst:603
+msgid ""
+"**server_token_endpoint_path**: Path of OAuth2 server token endpoint "
+"(used in swagger schema). If not provided, `/{API_URL}/oauth2/token/` "
+"will be used instead."
+msgstr ""
+"**server_token_endpoint_path**: Путь к конечной точке выдачи токенов сервера OAuth2 "
+"(используется в схеме swagger). Если не указано, будет использоваться `/{API_URL}/oauth2/token/`."
+
+#: ../../config.rst:596
+msgid "OAuth 2 settings"
+msgstr "Настройки OAuth 2"
+
+#: ../../config.rst:598
+msgid "Section ``[oauth]``."
+msgstr "Раздел ``[oauth]``."
+
+#: ../../config.rst:600 ../../config.rst:605
+msgid "For custom OAuth2 server use the following settings:"
+msgstr "Для пользовательского сервера OAuth2 используйте следующие настройки:"
+
+#: ../../config.rst:607
+msgid "**server_enable**: Enable or disable OAuth2 server. Default: `True`."
+msgstr "**server_enable**: Включить или отключить сервер OAuth2. По умолчанию: `True`."
+
+#: ../../config.rst:608
+msgid "**server_issuer**: Issuer for JWT tokens. Must be provided."
+msgstr "**server_issuer**: Эмитент для JWT токенов. Должен быть указан."
+
+#: ../../config.rst:609
+msgid ""
+"**server_jwt_key**: JWT key. Octet sequence (used to represent symmetric "
+"keys). Must be provided."
+msgstr ""
+"**server_jwt_key**: Ключ JWT. Последовательность октетов (используется для представления симметричных "
+"ключей). Должен быть указан."
+
+#: ../../config.rst:610
+msgid "**server_jwt_alg**: JWT algorithm. Default: `HS256`."
+msgstr "**server_jwt_alg**: Алгоритм JWT. По умолчанию: `HS256`."
+
+#: ../../config.rst:611
+msgid ""
+"**server_class**: Import path to OAuth2 server class. See `authlib docs "
+"<https://docs.authlib.org/en/latest/specs/rfc6749.html#authlib.oauth2.rfc6749.AuthorizationServer>`_"
+" for more information. Default: "
+"`vstutils.oauth2.authorization_server.AuthorizationServer`."
+msgstr ""
+"**server_class**: Путь импорта к классу сервера OAuth2. См. `документацию authlib "
+"<https://docs.authlib.org/en/latest/specs/rfc6749.html#authlib.oauth2.rfc6749.AuthorizationServer>`_ "
+"для получения дополнительной информации. По умолчанию: "
+"`vstutils.oauth2.authorization_server.AuthorizationServer`."
+
+#: ../../config.rst:612
+msgid ""
+"**server_enable_anon_login**: Enable or disable anonymous login using "
+"empty strings as username and password. Default: `False`."
+msgstr ""
+"**server_enable_anon_login**: Включить или отключить анонимный вход, используя "
+"пустые строки в качестве имени пользователя и пароля. По умолчанию: `False`."
+#: ../../config.rst:613
+msgid ""
+"**server_jwt_extra_claims_provider**: Import path to function that "
+"receives user and returns extra claims for JWT token. Default: `None`."
+msgstr ""
+"**server_jwt_extra_claims_provider**: Путь импорта к функции, которая "
+"принимает пользователя и возвращает дополнительные утверждения для JWT токена. По умолчанию: `None`."
+
+#: ../../config.rst:614
+msgid ""
+"**server_allow_insecure**: If enabled then server will allow HTTP "
+"requests. Default: `False`."
+msgstr ""
+"**server_allow_insecure**: Если включено, сервер будет разрешать HTTP "
+"запросы. По умолчанию: `False`."
+
+#: ../../config.rst:615
+msgid ""
+"**server_token_expires_in**: Token expiration time in seconds. Duration "
+"values can be used, for example `3d2h32m`. Default: `864000`."
+msgstr ""
+"**server_token_expires_in**: Время истечения токена в секундах. Можно использовать "
+"значения продолжительности, например `3d2h32m`. По умолчанию: `864000`."
+
+#: ../../config.rst:616
+msgid ""
+"**server_client_authentication_methods**: List of client authentication "
+"methods. Default server supports following values `'client_secret_basic',"
+" 'client_secret_post', 'none'`. Default: `['client_secret_basic', "
+"'client_secret_post']`."
+msgstr ""
+"**server_client_authentication_methods**: Список методов аутентификации клиента. "
+"Сервер по умолчанию поддерживает следующие значения `'client_secret_basic', "
+"'client_secret_post', 'none'`. По умолчанию: `['client_secret_basic', "
+"'client_secret_post']`."
+
+#: ../../config.rst:617
+msgid ""
+"**server_authorization_endpoint**: Url of OAuth 2 Authorization endpoint."
+" Will appear in output of `/.well-known/oauth-authorization-server` and "
+"`/.well-known/openid-configuration` discovery endpoints."
+msgstr ""
+"**server_authorization_endpoint**: URL конечной точки авторизации OAuth 2. "
+"Появится в выводе `/.well-known/oauth-authorization-server` и "
+"`/.well-known/openid-configuration` точек обнаружения."
+
+#: ../../config.rst:619
+msgid ""
+"By default one client can be configured using **server_simple_client_id**"
+" and **server_simple_client_secret**. Any other clients can be configured"
+" using **OAUTH_SERVER_CLIENTS** dictionary in `settings.py` where key is "
+"`client_id` and value is `client_secret`."
+msgstr ""
+"По умолчанию один клиент может быть настроен с использованием **server_simple_client_id** "
+"и **server_simple_client_secret**. Любые другие клиенты могут быть настроены "
+"с использованием словаря **OAUTH_SERVER_CLIENTS** в `settings.py`, где ключ - это "
+"`client_id`, а значение - `client_secret`."
+
+#: ../../config.rst:623
 msgid "Production web settings"
 msgstr "Настройки для продакшн-сервера"
 
-#: ../../config.rst:598
+#: ../../config.rst:625
 msgid "Section ``[uwsgi]``."
 msgstr "Раздел ``[uwsgi]``."
 
-#: ../../config.rst:600
+#: ../../config.rst:627
 msgid ""
 "Settings related to web-server used by vstutils-based application in "
 "production (for deb and rpm packages by default). Most of them related to"
@@ -1709,7 +1842,7 @@ msgstr ""
 "т. д.). Дополнительные настройки смотрите в `документации uWSGI. <http"
 "://uwsgi-docs.readthedocs.io/en/latest/Configuration.html>`_."
 
-#: ../../config.rst:606
+#: ../../config.rst:633
 msgid ""
 "But keep in mind that uWSGI is deprecated and may be removed in future "
 "releases. Use the uvicorn settings to manage your app server."
@@ -1718,15 +1851,15 @@ msgstr ""
 "версиях. Используйте настройки uvicorn для управления сервером вашего "
 "приложения."
 
-#: ../../config.rst:611
+#: ../../config.rst:638
 msgid "Working behind the proxy server with TLS"
 msgstr "Работа за прокси-сервером с поддержкой TLS"
 
-#: ../../config.rst:614
+#: ../../config.rst:641
 msgid "Nginx"
 msgstr "Nginx"
 
-#: ../../config.rst:616
+#: ../../config.rst:643
 msgid ""
 "To configure vstutils for operation behind Nginx with TLS, follow these "
 "steps:"
@@ -1734,11 +1867,11 @@ msgstr ""
 "Чтобы настроить vstutils для работы через Nginx с поддержкой TLS, "
 "выполните следующие шаги:"
 
-#: ../../config.rst:618
+#: ../../config.rst:645
 msgid "**Install Nginx:**"
 msgstr "**Установка Nginx:**"
 
-#: ../../config.rst:620
+#: ../../config.rst:647
 msgid ""
 "Ensure that Nginx is installed on your server. You can install it using "
 "the package manager specific to your operating system."
@@ -1747,11 +1880,11 @@ msgstr ""
 "его с помощью менеджера пакетов, специфичного для вашей операционной "
 "системы."
 
-#: ../../config.rst:622
+#: ../../config.rst:649
 msgid "**Configure Nginx:**"
 msgstr "**Настройка Nginx:**"
 
-#: ../../config.rst:624
+#: ../../config.rst:651
 msgid ""
 "Create an Nginx configuration file for your vstutils application. Below "
 "is a basic example of an Nginx configuration. Adjust the values based on "
@@ -1761,7 +1894,7 @@ msgstr ""
 "приведен базовый пример конфигурации Nginx. Измените значения в "
 "соответствии с вашей конкретной настройкой."
 
-#: ../../config.rst:663
+#: ../../config.rst:690
 msgid ""
 "Replace ``your_domain.com`` with your actual domain, and update the paths"
 " for SSL certificates."
@@ -1769,11 +1902,11 @@ msgstr ""
 "Замените ``your_domain.com`` на ваш реальный домен и обновите пути к "
 "SSL-сертификатам."
 
-#: ../../config.rst:665 ../../config.rst:748 ../../config.rst:800
+#: ../../config.rst:692 ../../config.rst:775 ../../config.rst:827
 msgid "**Update vstutils settings:**"
 msgstr "**Обновление настроек vstutils:**"
 
-#: ../../config.rst:667 ../../config.rst:750 ../../config.rst:802
+#: ../../config.rst:694 ../../config.rst:777 ../../config.rst:829
 msgid ""
 "Ensure that your vstutils settings have the correct configurations for "
 "HTTPS. In your ``/etc/vstutils/settings.ini`` (or project "
@@ -1783,21 +1916,21 @@ msgstr ""
 "HTTPS. В вашем ``/etc/vstutils/settings.ini`` (или в проекте "
 "``settings.ini``):"
 
-#: ../../config.rst:675
+#: ../../config.rst:702
 msgid "This ensures that vstutils recognizes the HTTPS connection."
 msgstr "Это гарантирует, что vstutils распознает соединение по протоколу HTTPS."
 
-#: ../../config.rst:677
+#: ../../config.rst:704
 msgid "**Restart Nginx:**"
 msgstr "**Перезапустите Nginx:**"
 
-#: ../../config.rst:679
+#: ../../config.rst:706
 msgid "After making these changes, restart Nginx to apply the new configurations:"
 msgstr ""
 "После внесения этих изменений перезапустите Nginx, чтобы применить новые "
 "конфигурации:"
 
-#: ../../config.rst:685
+#: ../../config.rst:712
 msgid ""
 "Now, your vstutils application should be accessible via HTTPS through "
 "Nginx. Adjust these instructions based on your specific environment and "
@@ -1807,11 +1940,11 @@ msgstr ""
 "Nginx. Измените эти инструкции в зависимости от вашего конкретного "
 "окружения и требований к безопасности."
 
-#: ../../config.rst:689
+#: ../../config.rst:716
 msgid "Traefik"
 msgstr "Traefik"
 
-#: ../../config.rst:691
+#: ../../config.rst:718
 msgid ""
 "To configure vstutils for operation behind Traefik with TLS, follow these"
 " steps:"
@@ -1819,11 +1952,11 @@ msgstr ""
 "Чтобы настроить vstutils для работы через Traefik с поддержкой TLS, "
 "выполните следующие шаги:"
 
-#: ../../config.rst:693
+#: ../../config.rst:720
 msgid "**Install Traefik:**"
 msgstr "**Установка Traefik:**"
 
-#: ../../config.rst:695
+#: ../../config.rst:722
 msgid ""
 "Ensure that Traefik is installed on your server. You can download the "
 "binary from the official website or use a package manager specific to "
@@ -1833,11 +1966,11 @@ msgstr ""
 "двоичный файл с официального сайта или использовать менеджер пакетов, "
 "специфичный для вашей операционной системы."
 
-#: ../../config.rst:697
+#: ../../config.rst:724
 msgid "**Configure Traefik:**"
 msgstr "**Настройка Traefik:**"
 
-#: ../../config.rst:699
+#: ../../config.rst:726
 msgid ""
 "Create a Traefik configuration file ``/path/to/traefik.toml``. Here's a "
 "basic example:"
@@ -1845,29 +1978,29 @@ msgstr ""
 "Создайте файл конфигурации Traefik ``/path/to/traefik.toml``. Вот базовый"
 " пример:"
 
-#: ../../config.rst:721
+#: ../../config.rst:748
 msgid "**Create Traefik Toml Configuration:**"
 msgstr "**Создайте конфигурацию Traefik Toml:**"
 
-#: ../../config.rst:723
+#: ../../config.rst:750
 msgid ""
 "Create the ``/path/to/traefik_config.toml`` file with the following "
 "content:"
 msgstr "Создайте файл ``/path/to/traefik_config.toml`` с следующим содержимым:"
 
-#: ../../config.rst:746
+#: ../../config.rst:773
 msgid "Make sure to replace ``your_domain.com`` with your actual domain."
 msgstr "Обязательно замените ``your_domain.com`` на ваш реальный домен."
 
-#: ../../config.rst:757
+#: ../../config.rst:784
 msgid "**Start Traefik:**"
 msgstr "**Запустите Traefik:**"
 
-#: ../../config.rst:759
+#: ../../config.rst:786
 msgid "Start Traefik with the following command:"
 msgstr "Запустите Traefik следующей командой:"
 
-#: ../../config.rst:765
+#: ../../config.rst:792
 msgid ""
 "Now, your vstutils application should be accessible via HTTPS through "
 "Traefik. Adjust these instructions based on your specific environment and"
@@ -1877,15 +2010,15 @@ msgstr ""
 "Traefik. Измените эти инструкции в зависимости от вашего конкретного "
 "окружения и требований."
 
-#: ../../config.rst:769
+#: ../../config.rst:796
 msgid "HAProxy"
 msgstr "HAProxy"
 
-#: ../../config.rst:771
+#: ../../config.rst:798
 msgid "**Install HAProxy:**"
 msgstr "**Установка HAProxy:**"
 
-#: ../../config.rst:773
+#: ../../config.rst:800
 msgid ""
 "Ensure that HAProxy is installed on your server. You can install it using"
 " the package manager specific to your operating system."
@@ -1894,11 +2027,11 @@ msgstr ""
 "его с помощью менеджера пакетов, специфичного для вашей операционной "
 "системы."
 
-#: ../../config.rst:775
+#: ../../config.rst:802
 msgid "**Configure HAProxy:**"
 msgstr "**Настройка HAProxy:**"
 
-#: ../../config.rst:777
+#: ../../config.rst:804
 msgid ""
 "Create an HAProxy configuration file for your vstutils application. Below"
 " is a basic example of an HAProxy configuration. Adjust the values based "
@@ -1908,7 +2041,7 @@ msgstr ""
 "базовый пример конфигурации HAProxy. Измените значения в соответствии с "
 "вашей конкретной настройкой."
 
-#: ../../config.rst:798
+#: ../../config.rst:825
 msgid ""
 "Replace ``your_domain.com`` with your actual domain and update the paths "
 "for SSL certificates."
@@ -1916,11 +2049,11 @@ msgstr ""
 "Замените ``your_domain.com`` на ваш реальный домен и обновите пути к "
 "SSL-сертификатам."
 
-#: ../../config.rst:809
+#: ../../config.rst:836
 msgid "**Restart HAProxy:**"
 msgstr "**Перезапуск HAProxy:**"
 
-#: ../../config.rst:811
+#: ../../config.rst:838
 msgid ""
 "After making these changes, restart HAProxy to apply the new "
 "configurations:"
@@ -1928,7 +2061,7 @@ msgstr ""
 "После внесения этих изменений перезапустите HAProxy, чтобы применить "
 "новые конфигурации."
 
-#: ../../config.rst:817
+#: ../../config.rst:844
 msgid ""
 "Now, your vstutils application should be accessible via HTTPS through "
 "HAProxy. Adjust these instructions based on your specific environment and"
@@ -1938,11 +2071,11 @@ msgstr ""
 "HAProxy. Измените эти инструкции в зависимости от вашего конкретного "
 "окружения и требований к безопасности."
 
-#: ../../config.rst:821
+#: ../../config.rst:848
 msgid "Configuration options"
 msgstr "Параметры конфигурации"
 
-#: ../../config.rst:823
+#: ../../config.rst:850
 msgid ""
 "This section contains additional information for configure additional "
 "elements."
@@ -1950,7 +2083,7 @@ msgstr ""
 "В этом разделе содержится дополнительная информация для настройки "
 "дополнительных элементов."
 
-#: ../../config.rst:825
+#: ../../config.rst:852
 msgid ""
 "If you need set ``https`` for your web settings, you can do it using "
 "HAProxy, Nginx, Traefik or configure it in ``settings.ini``."
@@ -1959,7 +2092,7 @@ msgstr ""
 " сделать это с помощью HAProxy, Nginx, Traefik или настроить в файле "
 "``settings.ini``."
 
-#: ../../config.rst:837
+#: ../../config.rst:864
 msgid ""
 "We strictly do not recommend running the web server from root. Use HTTP "
 "proxy to run on privileged ports."
@@ -1967,7 +2100,7 @@ msgstr ""
 "Мы настоятельно не рекомендуем запускать веб-сервер от имени root. "
 "Используйте HTTP-прокси, чтобы работать на привилегированных портах."
 
-#: ../../config.rst:839
+#: ../../config.rst:866
 msgid ""
 "You can use `{ENV[HOME:-value]}` (where `HOME` is environment variable, "
 "`value` is default value) in configuration values."
@@ -1975,7 +2108,7 @@ msgstr ""
 "Вы можете использовать `{ENV[HOME:-value]}` (где `HOME` - переменная "
 "окружения, `value` - значение по умолчанию) в значениях конфигурации."
 
-#: ../../config.rst:842
+#: ../../config.rst:869
 msgid ""
 "You can use environment variables for setup important settings. But "
 "config variables has more priority then env. Available settings are: "
@@ -1988,7 +2121,7 @@ msgstr ""
 "``DJANGO_LOG_LEVEL``, ``TIMEZONE`` и некоторые настройки с префиксом "
 "``[ENV_NAME]``."
 
-#: ../../config.rst:845
+#: ../../config.rst:872
 msgid ""
 "For project without special settings and project levels named ``project``"
 " these variables will start with ``PROJECT_`` prefix. There is a list of "
@@ -2012,7 +2145,7 @@ msgstr ""
 "``{ENV_NAME}_GLOBAL_THROTTLE_RATE``, и "
 "``{ENV_NAME}_GLOBAL_THROTTLE_ACTIONS``."
 
-#: ../../config.rst:852
+#: ../../config.rst:879
 msgid ""
 "There are also URI-specific variables for connecting to various services "
 "such as databases and caches. There are ``DATABASE_URL``, ``CACHE_URL``, "
@@ -2026,7 +2159,7 @@ msgstr ""
 "``SESSIONS_CACHE_URL`` и ``ETAG_CACHE_URL``. Как видно из названий, они "
 "тесно связаны с ключами и именами соответствующих секций конфигурации."
 
-#: ../../config.rst:856
+#: ../../config.rst:883
 msgid ""
 "We recommend to install ``uvloop`` to your environment and setup ``loop ="
 " uvloop`` in ``[uvicorn]`` section for performance reasons."
@@ -2034,7 +2167,7 @@ msgstr ""
 "Мы рекомендуем установить ``uvloop`` в ваше окружение и настроить ``loop "
 "= uvloop`` в разделе ``[uvicorn]`` для повышения производительности."
 
-#: ../../config.rst:858
+#: ../../config.rst:885
 msgid ""
 "In the context of vstutils, the adoption of ``uvloop`` is paramount for "
 "optimizing the performance of the application, especially because "
@@ -2052,7 +2185,7 @@ msgstr ""
 "библиотеки высокопроизводительного цикла событий, и специально разработан"
 " для оптимизации скорости выполнения асинхронного кода."
 
-#: ../../config.rst:862
+#: ../../config.rst:889
 msgid ""
 "By leveraging ``uvloop``, developers can achieve substantial performance "
 "improvements in terms of reduced latency and increased throughput. This "
diff --git a/requirements-prod.txt b/requirements-prod.txt
index 884b79bb..60fcee3a 100644
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -2,6 +2,6 @@
 # PyMySQL>=0.9.2,<=0.9.3; python_version<'3.0'
 # mysql-connector-python==8.0.15; python_version>'3.4'
 # Advanced cache support
-redis[hiredis]~=5.0.3
+redis[hiredis]~=5.0.5
 tarantool~=1.2.0
 pywebpush~=2.0.0
diff --git a/requirements-rpc.txt b/requirements-rpc.txt
index 4fb933d7..afe43c29 100644
--- a/requirements-rpc.txt
+++ b/requirements-rpc.txt
@@ -1,3 +1,3 @@
 # Packages needed for delayed jobs.
-celery[redis]==5.3.6
+celery[redis]==5.4.0
 django-celery-beat~=2.6.0
diff --git a/requirements-rtd.txt b/requirements-rtd.txt
index 783f8323..a377bb3d 100644
--- a/requirements-rtd.txt
+++ b/requirements-rtd.txt
@@ -1,7 +1,7 @@
 -rrequirements.txt
 -rrequirements-doc.txt
 -rrequirements-rpc.txt
-django~=5.0.3
+django~=5.0.6
 httpx>=0.27.0
 typing-extensions
-sphinx-intl~=2.1.0
+sphinx-intl~=2.2.0
diff --git a/requirements-stubs.txt b/requirements-stubs.txt
index 946ca906..826ea02a 100644
--- a/requirements-stubs.txt
+++ b/requirements-stubs.txt
@@ -1,5 +1,5 @@
-django-stubs[compatible-mypy]~=4.2.7
-djangorestframework-stubs[compatible-mypy]~=3.14.5
+django-stubs[compatible-mypy]~=5.0.2
+djangorestframework-stubs[compatible-mypy]~=3.15.0
 celery-stubs~=0.1.3
 drf-yasg-stubs~=0.1.4
 django-filter-stubs~=0.1.3
@@ -7,4 +7,4 @@ types-PyMySQL==1.1.0.1
 types-Markdown==3.5.0.3
 types-docutils==0.20.0.3
 types-aiofiles~=23.2.0.0
-typing-extensions~=4.9.0
+typing-extensions~=4.11.0
diff --git a/requirements-test.txt b/requirements-test.txt
index 070113bf..7ccf63f0 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,5 +1,5 @@
 # Packages needed for test
-coverage~=7.4.4
+coverage~=7.5.3
 fakeldap~=0.6.6
 tblib==3.0.0
 beautifulsoup4~=4.12.3
diff --git a/requirements.txt b/requirements.txt
index dbaad3e3..aed71338 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,13 +6,13 @@ django-environ~=0.11.2
 # REST API packages
 djangorestframework~=3.15.1
 drf-yasg==1.21.7
-django-filter==23.5
+django-filter==24.2
 drf_orjson_renderer==1.7.1
-ormsgpack~=1.4.2
+ormsgpack~=1.5.0
 pyyaml~=6.0.1
 
 # web server
-uvicorn~=0.28.0
+uvicorn~=0.30.1
 pyuwsgi==2.0.23.post0
 # Restore it if some problems with pyuwsgi
 # uwsgi==2.0.23
@@ -23,7 +23,7 @@ aiofiles==23.2.1
 cent~=4.1.0
 
 # Auth
-Authlib==1.3.0
+Authlib~=1.3.1
 
 # Minificators
 jsmin~=3.0.1
@@ -33,4 +33,4 @@ django-htmlmin~=0.11.0
 pyotp~=2.9.0
 
 # Storage
-django-storages[libcloud]==1.14.2
+django-storages[libcloud]==1.14.3
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 7e948d23..1dfbfe5a 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b2'
+__version__: str = '5.10.0b3'
diff --git a/vstutils/drivers/cache.py b/vstutils/drivers/cache.py
index 13359c89..1547adb8 100644
--- a/vstutils/drivers/cache.py
+++ b/vstutils/drivers/cache.py
@@ -2,7 +2,7 @@
 
 import tarantool
 from django.core.cache.backends.base import BaseCache, DEFAULT_TIMEOUT
-from django.core.cache.backends.redis import RedisSerializer as Serializer  # type: ignore[import-untyped]
+from django.core.cache.backends.redis import RedisSerializer as Serializer
 from django.utils.functional import cached_property
 
 
@@ -180,7 +180,7 @@ def set_many(self, data, timeout=DEFAULT_TIMEOUT, version=None):
         for key, value in data.items():
             key = f"'{self.make_and_validate_key(key, version=version)}'"
             quote = "'" if not type(value) is int else ""
-            safe_data[key] = f"{quote}{self._serializer.dumps(value)}{quote}"
+            safe_data[key] = f"{quote}{self._serializer.dumps(value)}{quote}"  # type: ignore[str-bytes-safe]
 
         timeout = self.get_backend_timeout(timeout=timeout)
         if timeout != -1:

From 43fea825b843e0dd209469b633c47810c8d4bb5f Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Tue, 11 Jun 2024 17:06:27 -0700
Subject: [PATCH 13/46] Release 5.10.0b4

### Changelog:
* Fix(backend): Use for ``web`` command ``DJANGO_SETTINGS_MODULE`` which was parsed.
* Chore(backend): Update Pillow package.
* Chore(ci): Combine code check to two groups.
---
 .gitlab-ci.yml                      | 10 ++++------
 package.json                        |  2 +-
 setup.py                            |  2 +-
 vstutils/__init__.py                |  2 +-
 vstutils/management/commands/web.py |  2 +-
 vstutils/settings.py                |  1 +
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9cc94192..41084089 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,10 +62,8 @@ code_style:
   parallel:
     matrix:
       - TOX_ENVS:
-          - flake
-          - mypy
-          - pylint
-          - bandit
+          - flake,bandit
+          - mypy,pylint
 
 js_style:
   <<: *branch_js_tests
@@ -138,11 +136,11 @@ release_packages:
     - when: never
   script:
     - echo MILESTONE=${CI_COMMIT_TAG%.*} > variables.env
-    # pypi
     - tox -e build
+    - yarn build-lib
+    # pypi
     - twine upload -u ${PYPI_UPLOAD_NAME} -p ${PYPI_UPLOAD_PASSWORD} $(find dist/* -type f -name '*.tar.gz') $(find dist/* -type f -name '*.whl')
     # npm
-    - yarn build-lib
     - echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}'>.npmrc
     - npm publish --access public
   allow_failure: true
diff --git a/package.json b/package.json
index fd186de1..5e61e771 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vstconsulting/vstutils",
-  "version": "5.10.0b2",
+  "version": "5.10.0b4",
   "type": "module",
   "author": "VST Consulting",
   "license": "Apache-2.0",
diff --git a/setup.py b/setup.py
index 62c66d79..fc90125f 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@
         'doc': load_requirements('requirements-doc.txt'),
         'prod': load_requirements('requirements-prod.txt'),
         'stubs': load_requirements('requirements-stubs.txt'),
-        'pil': ['Pillow~=10.2.0'],
+        'pil': ['Pillow~=10.3.0'],
         'boto3': [
             i.replace('libcloud', 'libcloud,s3')
             for i in requirements
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 1dfbfe5a..a60de0c2 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b3'
+__version__: str = '5.10.0b4'
diff --git a/vstutils/management/commands/web.py b/vstutils/management/commands/web.py
index 997e1a9c..8aa81534 100644
--- a/vstutils/management/commands/web.py
+++ b/vstutils/management/commands/web.py
@@ -140,7 +140,7 @@ def handle(self, *uwsgi_args, **opts):
             f'--set-ph=lib_name={settings.VST_PROJECT_LIB}',
             f'--set-ph=api_path={settings.API_URL}',
             f'--set-ph=vstutils_version={settings.VSTUTILS_VERSION}',
-            f'--env=DJANGO_SETTINGS_MODULE={os.getenv("DJANGO_SETTINGS_MODULE")}',
+            f'--env=DJANGO_SETTINGS_MODULE={settings.DJANGO_SETTINGS_MODULE}',
             f'--python-worker-override={settings.UWSGI_WORKER_PATH}',
             f'--socket={opts["addrport"]}'
         ]
diff --git a/vstutils/settings.py b/vstutils/settings.py
index 0fba4f4b..394cb83e 100644
--- a/vstutils/settings.py
+++ b/vstutils/settings.py
@@ -50,6 +50,7 @@ def __getitem__(self, item):
 PROJECT_VERSION: _t.Text = getattr(vst_project_module, '__version__', PROJECT_LIB_VERSION)
 FULL_VERSION: _t.Text = f'{PROJECT_VERSION}_{PROJECT_LIB_VERSION}_{VSTUTILS_VERSION}'
 PROJECT_GUI_NAME: _t.Text = os.getenv("VST_PROJECT_GUI_NAME", ENV_NAME[0].upper()+ENV_NAME[1:].lower())
+DJANGO_SETTINGS_MODULE: _t.Text = os.getenv("DJANGO_SETTINGS_MODULE")
 
 PY_VER: _t.SupportsInt = sys.version_info.major
 TMP_DIR: _t.Text = gettempdir() or '/tmp'  # nosec

From 0441361a4ab0fec1cb932af40b0b6a30b0c6941e Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Tue, 11 Jun 2024 17:25:02 -0700
Subject: [PATCH 14/46] Release 5.10.0b4

### Changelog:
* Fix(backend): Use for ``web`` command ``DJANGO_SETTINGS_MODULE`` which was parsed.
* Chore(backend): Update Pillow package.
* Chore(ci): Combine code check to two groups.
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41084089..f92e868f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -136,11 +136,11 @@ release_packages:
     - when: never
   script:
     - echo MILESTONE=${CI_COMMIT_TAG%.*} > variables.env
-    - tox -e build
-    - yarn build-lib
     # pypi
+    - tox -e build
     - twine upload -u ${PYPI_UPLOAD_NAME} -p ${PYPI_UPLOAD_PASSWORD} $(find dist/* -type f -name '*.tar.gz') $(find dist/* -type f -name '*.whl')
     # npm
+    - yarn build-lib
     - echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}'>.npmrc
     - npm publish --access public
   allow_failure: true

From ad71828b2da9e6057384256222306700a4d8f025 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Wed, 12 Jun 2024 00:27:25 -0700
Subject: [PATCH 15/46] Release 5.10.0b5

### Changelog:
* Feature(backend): Use uvloop if installed for uwsgi workers.
* Fix(backend): Change content disposition as ``inline`` for static files.
* Chore(backend): Disable session auth for swagger ui.
---
 pyproject.toml          |  1 +
 vstutils/__init__.py    |  2 +-
 vstutils/asgi.py        |  6 +++++-
 vstutils/asgi_worker.py | 10 +++++++++-
 vstutils/settings.py    |  4 +++-
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 83a7700a..6af4dbf8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -157,5 +157,6 @@ module = [
     "tarantool.*",
     "pywebpush.*",
     "authlib.*",
+    "uvloop.*",
 ]
 ignore_missing_imports = true
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index a60de0c2..9c6eed50 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b4'
+__version__: str = '5.10.0b5'
diff --git a/vstutils/asgi.py b/vstutils/asgi.py
index 389a15e0..4ee190c8 100644
--- a/vstutils/asgi.py
+++ b/vstutils/asgi.py
@@ -70,7 +70,11 @@ async def static(file_path: str, request: Request = None):
     absolute_path = find_absolute_path(file_path)
     if not absolute_path or await aiofiles.os.path.isdir(absolute_path):
         return PlainTextResponse('Not found', status_code=404)
-    response = FileResponse(absolute_path, stat_result=await aiofiles.os.stat(absolute_path))
+    response = FileResponse(
+        absolute_path,
+        stat_result=await aiofiles.os.stat(absolute_path),
+        content_disposition_type='inline'
+    )
     if request is not None and StaticFiles.is_not_modified(None, response.headers, request.headers):  # type: ignore
         return NotModifiedResponse(response.headers)
     return response
diff --git a/vstutils/asgi_worker.py b/vstutils/asgi_worker.py
index 88c87776..e1edd172 100644
--- a/vstutils/asgi_worker.py
+++ b/vstutils/asgi_worker.py
@@ -11,6 +11,13 @@
 from django.conf import settings
 from django.utils.module_loading import import_string
 
+try:
+    import uvloop
+    uwsgi.log('uvloop installed.')
+except ImportError:
+    uwsgi.log('No uvloop installed. Run with native asyncio.')
+    uvloop = None
+
 django.setup(set_prefix=False)
 
 # Import application
@@ -47,6 +54,7 @@ async def init(servers_list, fds, app):
 def destroy():
     uwsgi.log(f"destroy worker {uwsgi.worker_id()}")
     for server in servers:
+        server.should_exit = True
         server.handle_exit(sig=signal.SIGINT, frame=None)
     time.sleep(1)
     uwsgi.log(f"exit worker {uwsgi.worker_id()}")
@@ -65,7 +73,7 @@ def graceful_reload():
 
 if __name__ == '__main__':
     # Init event loop and destroy handlers
-    loop = asyncio.get_event_loop()
+    loop = asyncio.new_event_loop() if uvloop is None else uvloop.new_event_loop()
     loop.add_signal_handler(signal.SIGINT, destroy)
     loop.add_signal_handler(signal.SIGTERM, destroy)
     loop.add_signal_handler(signal.SIGHUP, graceful_reload)
diff --git a/vstutils/settings.py b/vstutils/settings.py
index 394cb83e..99c95156 100644
--- a/vstutils/settings.py
+++ b/vstutils/settings.py
@@ -587,7 +587,8 @@ class DjangoEnv(environ.Env):
             'pidfile': env.str(f'{ENV_NAME}_WORKER_PID', default='/run/{PROG_NAME}_worker.pid'),
             'autoscale': '{this[rpc][concurrency]},1',
             'hostname': f'{pwd.getpwuid(os.getuid()).pw_name}@%h',
-            'beat': env.bool(f'{ENV_NAME}_SCHEDULER_ENABLE', default=True)
+            'beat': env.bool(f'{ENV_NAME}_SCHEDULER_ENABLE', default=True),
+            'pool': 'prefork'
         },
         'storages': {
             'filesystem': {
@@ -1114,6 +1115,7 @@ def parse_db(params):
         'vstutils.api.schema.renderers.OpenAPIRenderer',
     ],
     'DEEP_LINKING': True,
+    'USE_SESSION_AUTH': False,
     'SECURITY_DEFINITIONS': {},
 }
 

From 92e8390b3ed0d65e4160d4d4175205e51eee238f Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Wed, 12 Jun 2024 20:24:29 -0700
Subject: [PATCH 16/46] Release 5.10.0b6

### Changelog:
* Feature(backend): Improve uwsgi workers start/stop.
* Fix(backend): Tests fails on celery worker settings.
* Fix(package): Setup correct python requirement + add ``oauth2`` keyword.
* Chore(ci): Autosetup version for js project from python.
---
 .gitlab-ci.yml                          |  3 +
 frontend_src/__tests__/startapp.test.ts | 26 ++++----
 package.json                            |  2 +-
 pyproject.toml                          |  4 +-
 test_src/test_proj/tests.py             |  3 +-
 vstutils/__init__.py                    |  2 +-
 vstutils/asgi_worker.py                 | 80 ++++++++++++-------------
 vstutils/web.ini                        |  4 ++
 8 files changed, 66 insertions(+), 58 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f92e868f..9024e664 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,7 +140,10 @@ release_packages:
     - tox -e build
     - twine upload -u ${PYPI_UPLOAD_NAME} -p ${PYPI_UPLOAD_PASSWORD} $(find dist/* -type f -name '*.tar.gz') $(find dist/* -type f -name '*.whl')
     # npm
+    - VERSION=$(grep "__version__" vstutils/__init__.py | sed -E "s/__version__: str = '(.+)'/\1/")
+    - sed -i -E "s/\"version\": \"[^\"]+\"/\"version\": \"$VERSION\"/" package.json
     - yarn build-lib
+    - cp -v README.rst dist/README.rst
     - echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}'>.npmrc
     - npm publish --access public
   allow_failure: true
diff --git a/frontend_src/__tests__/startapp.test.ts b/frontend_src/__tests__/startapp.test.ts
index 3e0901c8..4763a444 100644
--- a/frontend_src/__tests__/startapp.test.ts
+++ b/frontend_src/__tests__/startapp.test.ts
@@ -12,17 +12,17 @@ describe('App', () => {
         await waitFor(() => screen.getByText('Homepage content'));
     });
 
-    test('npm version matches pip version', async () => {
-        const root = join(dirname(fileURLToPath(import.meta.url)), '..', '..');
-
-        const [packageJsonContent, initPyContent] = await Promise.all([
-            readFile(join(root, 'package.json')),
-            readFile(join(root, 'vstutils', '__init__.py')),
-        ]);
-
-        const packageJsonVersion = JSON.parse(packageJsonContent.toString()).version;
-        const initPyVersion = /__version__: str = '(.+)'/.exec(initPyContent.toString())?.[1];
-
-        expect(packageJsonVersion).toBe(initPyVersion);
-    });
+    // test('npm version matches pip version', async () => {
+    //     const root = join(dirname(fileURLToPath(import.meta.url)), '..', '..');
+    //
+    //     const [packageJsonContent, initPyContent] = await Promise.all([
+    //         readFile(join(root, 'package.json')),
+    //         readFile(join(root, 'vstutils', '__init__.py')),
+    //     ]);
+    //
+    //     const packageJsonVersion = JSON.parse(packageJsonContent.toString()).version;
+    //     const initPyVersion = /__version__: str = '(.+)'/.exec(initPyContent.toString())?.[1];
+    //
+    //     expect(packageJsonVersion).toBe(initPyVersion);
+    // });
 });
diff --git a/package.json b/package.json
index 5e61e771..2ab18339 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vstconsulting/vstutils",
-  "version": "5.10.0b4",
+  "version": "5.10.0b5",
   "type": "module",
   "author": "VST Consulting",
   "license": "Apache-2.0",
diff --git a/pyproject.toml b/pyproject.toml
index 6af4dbf8..e132716e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ authors = [
 maintainers = [
     { name = "VST Consulting", email = "sergey.k@vstconsulting.net" }
 ]
-keywords = ["spa", "vue", "pwa", "framework", "openapi"]
+keywords = ["spa", "vue", "pwa", "framework", "openapi", "oauth2"]
 license = {text = "Apache License 2.0" }
 description = "VST Utils Framework for fast create web-application"
 classifiers = [
@@ -36,7 +36,7 @@ classifiers = [
     "Topic :: Software Development :: User Interfaces",
     "Topic :: Utilities",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 dynamic = ["version", "dependencies", "optional-dependencies"]
 
 [project.urls]
diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index fbc09a8d..f9709fcf 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -5745,7 +5745,8 @@ def test_file_reader(self):
             'pidfile': '/run/test_proj_worker.pid',
             'autoscale': '4,1',
             'hostname': f'{pwd.getpwuid(os.getuid()).pw_name}@%h',
-            'beat': True
+            'beat': True,
+            'pool': 'prefork',
         }
         self.assertDictEqual(worker_options, settings.WORKER_OPTIONS)
 
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 9c6eed50..9f48bb04 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b5'
+__version__: str = '5.10.0b6'
diff --git a/vstutils/asgi_worker.py b/vstutils/asgi_worker.py
index e1edd172..df372497 100644
--- a/vstutils/asgi_worker.py
+++ b/vstutils/asgi_worker.py
@@ -1,9 +1,7 @@
-import typing as _t
 import sys
 import asyncio
 import signal
 import socket
-import time
 
 import uvicorn
 import uwsgi  # pylint: disable=import-error
@@ -12,37 +10,58 @@
 from django.utils.module_loading import import_string
 
 try:
-    import uvloop
-    uwsgi.log('uvloop installed.')
+    if not settings.RUN_WORKER:
+        import uvloop
+        uwsgi.log(f'uvloop installed on worker {uwsgi.worker_id()}.')
+    else:
+        uvloop = None
 except ImportError:
-    uwsgi.log('No uvloop installed. Run with native asyncio.')
+    uwsgi.log(f'No uvloop installed on worker {uwsgi.worker_id()}. Run with native asyncio.')
     uvloop = None
 
+try:
+    import h11
+    uwsgi.log(f'h11 installed on worker {uwsgi.worker_id()}.')
+except ImportError:
+    uwsgi.log(f'No h11 installed on worker {uwsgi.worker_id()}.')
+    h11 = None
+
 django.setup(set_prefix=False)
 
 # Import application
 application = import_string(settings.ASGI_APPLICATION)
 
 
-async def init(servers_list, fds, app):
+async def init(fds, app):
+    uvicorn_settings = settings.CONFIG['uvicorn'].all()
+    if uvloop:
+        uvicorn_settings.setdefault('loop', 'uvloop')
+    if h11:
+        uvicorn_settings.setdefault('http', 'h11')
     config = uvicorn.Config(
         app=app,
         interface='asgi3',
         log_level=settings.LOG_LEVEL.lower(),
         headers=settings.WEB_SERVER_HEADERS or None,
-        **settings.CONFIG['uvicorn'].all(),
+        **uvicorn_settings,
     )
     server = uvicorn.Server(config)
-    servers_list.append(server)
+    servers.append(server)
+    # Spawn a handler for every uWSGI socket
     sockets = [
         socket.fromfd(fd, socket.AF_INET, socket.SOCK_STREAM)
         for fd in fds
     ]
     try:
+        # Run worker server
         await server.serve(sockets=sockets)
-        uwsgi.log(f'uvicorn server stopped after {server.server_state.total_requests} requests.')
+        uwsgi.log(
+            f'Server uvicorn stopped after {server.server_state.total_requests} requests on worker {uwsgi.worker_id()}.'
+        )
+    except KeyboardInterrupt:
+        uwsgi.log(f'Stopped uvicorn server on worker {uwsgi.worker_id()}')
     except BaseException as exc:
-        uwsgi.log(f"uvicorn say: {str(exc)}")
+        uwsgi.log(f"uvicorn say: {str(exc)!r} on worker {uwsgi.worker_id()}")
         raise
     finally:
         for sock in sockets:
@@ -51,42 +70,23 @@ async def init(servers_list, fds, app):
                 sock.close()
 
 
-def destroy():
-    uwsgi.log(f"destroy worker {uwsgi.worker_id()}")
+def handle_sigterm():
+    uwsgi.log(f'Catch SIGTERM signal on worker {uwsgi.worker_id()}')
     for server in servers:
         server.should_exit = True
-        server.handle_exit(sig=signal.SIGINT, frame=None)
-    time.sleep(1)
-    uwsgi.log(f"exit worker {uwsgi.worker_id()}")
-    sys.exit(0)
-
-
-def graceful_reload():
-    uwsgi.log(f"graceful reload for worker {uwsgi.worker_id()}")
-    for server in servers:
-        server.handle_exit(sig=signal.SIGTERM, frame=None)
-    time.sleep(1)
-    loop.stop()
-    loop.close()
-    sys.exit(0)
+        server.handle_exit(signal.SIGINT, None)
 
 
 if __name__ == '__main__':
     # Init event loop and destroy handlers
     loop = asyncio.new_event_loop() if uvloop is None else uvloop.new_event_loop()
-    loop.add_signal_handler(signal.SIGINT, destroy)
-    loop.add_signal_handler(signal.SIGTERM, destroy)
-    loop.add_signal_handler(signal.SIGHUP, graceful_reload)
-
-    # TODO: Does it nessesary?
-    servers: _t.List[uvicorn.Server] = []
-
-    # Spawn a handler for every uWSGI socket
-    uwsgi.log(f'start uvicorn worker {uwsgi.worker_id()}')
-    loop.run_until_complete(init(servers, uwsgi.sockets, application))
+    loop.add_signal_handler(signal.SIGTERM, handle_sigterm)
 
-    # Start accepting requests via socket
-    uwsgi.accepting()
+    uwsgi.log(f'Start uvicorn worker {uwsgi.worker_id()}')
+    servers: list[uvicorn.Server] = []
+    loop.run_until_complete(init(uwsgi.sockets, application))
 
-    # Graceful shutdown
-    destroy()
+    uwsgi.log(f'Exiting uvicorn worker {uwsgi.worker_id()}')
+    loop.stop()
+    loop.close()
+    sys.exit(0)
diff --git a/vstutils/web.ini b/vstutils/web.ini
index abcecb7e..6d0ce0f3 100644
--- a/vstutils/web.ini
+++ b/vstutils/web.ini
@@ -51,4 +51,8 @@ print = uWSGI metrics enabled
 enable-metrics = true
 endif =
 
+if-not-opt = die-on-term=false
+die-on-term = true
+endif =
+
 print = Run %(program_name) with lib `%(lib_name)`

From c80908559e4767c7965d2b76ed6845986b388f11 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite@mail.ru>
Date: Thu, 13 Jun 2024 13:31:53 +1000
Subject: [PATCH 17/46] Release 5.10.0b6

### Changelog:
* Feature(backend): Improve uwsgi workers start/stop.
* Fix(backend): Tests fails on celery worker settings.
* Fix(package): Setup correct python requirement + add ``oauth2`` keyword.
* Chore(ci): Autosetup version for js project from python.
---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9024e664..73eb2450 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,8 +140,9 @@ release_packages:
     - tox -e build
     - twine upload -u ${PYPI_UPLOAD_NAME} -p ${PYPI_UPLOAD_PASSWORD} $(find dist/* -type f -name '*.tar.gz') $(find dist/* -type f -name '*.whl')
     # npm
-    - VERSION=$(grep "__version__" vstutils/__init__.py | sed -E "s/__version__: str = '(.+)'/\1/")
-    - sed -i -E "s/\"version\": \"[^\"]+\"/\"version\": \"$VERSION\"/" package.json
+    - |
+      VERSION=$(grep "__version__" vstutils/__init__.py | sed -E "s/__version__: str = '(.+)'/\1/")
+      sed -i -E "s/\"version\": \"[^\"]+\"/\"version\": \"$VERSION\"/" package.json
     - yarn build-lib
     - cp -v README.rst dist/README.rst
     - echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}'>.npmrc

From 60c507c1fbb6173f8e41add6e4f29fceb520c8bd Mon Sep 17 00:00:00 2001
From: Dmitriy Ovcharenko <ovcharenkodd@gmail.com>
Date: Fri, 14 Jun 2024 01:00:13 +1000
Subject: [PATCH 18/46] Feature(backend): Allow to override project of webpush
 notifications.

---
 frontend_src/__tests__/startapp.test.ts       |  17 ---
 .../components/common/OperationButton.vue     |  10 +-
 package.json                                  |   2 +-
 test_src/test_proj/settings.py                |   6 ++
 test_src/test_proj/tests.py                   | 101 +++++++++---------
 test_src/test_proj/webpushes.py               |   7 ++
 vstutils/__init__.py                          |   2 +-
 vstutils/oauth2/authorization_server.py       |  20 +++-
 vstutils/oauth2/client.py                     |   9 --
 vstutils/settings.py                          |  23 ++--
 vstutils/webpush/autodiscovery.py             |   5 +-
 vstutils/webpush/base.py                      |   5 +-
 12 files changed, 114 insertions(+), 93 deletions(-)

diff --git a/frontend_src/__tests__/startapp.test.ts b/frontend_src/__tests__/startapp.test.ts
index 4763a444..ad084441 100644
--- a/frontend_src/__tests__/startapp.test.ts
+++ b/frontend_src/__tests__/startapp.test.ts
@@ -1,6 +1,3 @@
-import { readFile } from 'node:fs/promises';
-import { join, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
 import { waitFor } from '@testing-library/dom';
 import { createApp, useTestCtx } from '@/unittests';
 
@@ -11,18 +8,4 @@ describe('App', () => {
         expect(app.user._data.username).toBe('testUser');
         await waitFor(() => screen.getByText('Homepage content'));
     });
-
-    // test('npm version matches pip version', async () => {
-    //     const root = join(dirname(fileURLToPath(import.meta.url)), '..', '..');
-    //
-    //     const [packageJsonContent, initPyContent] = await Promise.all([
-    //         readFile(join(root, 'package.json')),
-    //         readFile(join(root, 'vstutils', '__init__.py')),
-    //     ]);
-    //
-    //     const packageJsonVersion = JSON.parse(packageJsonContent.toString()).version;
-    //     const initPyVersion = /__version__: str = '(.+)'/.exec(initPyContent.toString())?.[1];
-    //
-    //     expect(packageJsonVersion).toBe(initPyVersion);
-    // });
 });
diff --git a/frontend_src/vstutils/components/common/OperationButton.vue b/frontend_src/vstutils/components/common/OperationButton.vue
index 25c6c6f0..14aa3aed 100644
--- a/frontend_src/vstutils/components/common/OperationButton.vue
+++ b/frontend_src/vstutils/components/common/OperationButton.vue
@@ -1,5 +1,5 @@
 <template>
-    <button type="button" :title="$t(title)" :class="buttonClasses">
+    <button type="button" :title="$t(title)" :class="buttonClasses" class="operation">
         <i v-if="iconClasses" class="icon-for-btn" :class="iconClasses" />
         <span v-if="title" class="title-for-btn" :class="{ 'd-none d-lg-inline-block': iconClasses }">
             {{ $t(title) }}
@@ -25,3 +25,11 @@
         },
     };
 </script>
+
+<style scoped>
+    .operation {
+        display: flex;
+        align-items: center;
+        gap: 5px;
+    }
+</style>
diff --git a/package.json b/package.json
index 2ab18339..950a1f31 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vstconsulting/vstutils",
-  "version": "5.10.0b5",
+  "version": "5.10.0b7",
   "type": "module",
   "author": "VST Consulting",
   "license": "Apache-2.0",
diff --git a/test_src/test_proj/settings.py b/test_src/test_proj/settings.py
index d2c2c530..8fcf195e 100644
--- a/test_src/test_proj/settings.py
+++ b/test_src/test_proj/settings.py
@@ -177,6 +177,12 @@
 
 WEBPUSH_USER_SETTINGS_VIEW_SUBPATH = 'custom_path'
 
+OAUTH_SERVER_CLIENTS['test-client'] = {
+    'allowed_grant_types': ['password', 'refresh_token'],
+    'token_endpoint_auth_methods': ['client_secret_post', 'client_secret_basic'],
+    'secret': 'test-client-secret',
+}
+
 OAUTH_SERVER_CLIENTS['some-app'] = {
     'allowed_grant_types': ['authorization_code'],
     'token_endpoint_auth_methods': ['none'],
diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index f9709fcf..0f34dd0d 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -6580,8 +6580,8 @@ def access_token_tester(self, prepare_data):
         response = client.post(
             '/api/oauth2/token/',
             **prepare_data({
-                'client_id': 'simple-client-id',
-                'client_secret': 'simple-client-secret',
+                'client_id': 'test-client',
+                'client_secret': 'test-client-secret',
                 'grant_type': 'password',
                 'username': user.username,
                 'password': 'invalid',
@@ -6601,8 +6601,8 @@ def access_token_tester(self, prepare_data):
             response = client.post(
                 '/api/oauth2/token/',
                 **prepare_data({
-                    'client_id': 'simple-client-id',
-                    'client_secret': 'simple-client-secret',
+                    'client_id': 'test-client',
+                    'client_secret': 'test-client-secret',
                     'grant_type': 'password',
                     'username': user.username,
                     'password': user.data['password'],
@@ -6637,11 +6637,11 @@ def access_token_tester(self, prepare_data):
             'session_key': claims['session_key'],
             'iss': 'https://test_proj.vst',
             'exp': 1060,
-            'client_id': 'simple-client-id',
+            'client_id': 'test-client',
             'iat': 1000,
             'scope': None,
             'sub': f'{user.id}',
-            'aud':'simple-client-id',
+            'aud':'test-client',
             'sup': False,
         })
 
@@ -6684,8 +6684,8 @@ def test_login_with_second_factor(self):
         user = self._create_user(is_super_user=False, is_staff=False)
         TwoFactor.objects.create(user=user, secret='ABCDE')
         auth_data = {
-            'client_id': 'simple-client-id',
-            'client_secret': 'simple-client-secret',
+            'client_id': 'test-client',
+            'client_secret': 'test-client-secret',
             'grant_type': 'password',
             'username': user.username,
             'password': user.data['password'],
@@ -6727,8 +6727,8 @@ def test_refresh_token_revocation(self):
 
         # Create refresh_token
         response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
-            'client_id': 'simple-client-id',
-            'client_secret': 'simple-client-secret',
+            'client_id': 'test-client',
+            'client_secret': 'test-client-secret',
             'grant_type': 'password',
             'username': user.username,
             'password': user.data['password'],
@@ -6738,8 +6738,8 @@ def test_refresh_token_revocation(self):
 
         # Revoke refresh_token
         response = self.client_class().post('/api/oauth2/revoke/', content_type='application/json', data={
-            'client_id': 'simple-client-id',
-            'client_secret': 'simple-client-secret',
+            'client_id': 'test-client',
+            'client_secret': 'test-client-secret',
             'token': refresh_token,
         })
         self.assertEqual(response.status_code, 200)
@@ -6747,8 +6747,8 @@ def test_refresh_token_revocation(self):
         # Check refresh token
         response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
             'grant_type': 'refresh_token',
-            'client_id': 'simple-client-id',
-            'client_secret': 'simple-client-secret',
+            'client_id': 'test-client',
+            'client_secret': 'test-client-secret',
             'refresh_token': refresh_token,
         })
         data = response.json()
@@ -6760,8 +6760,8 @@ def test_refresh_token_revocation(self):
 
         # Invocation endpoint must return 200 for unknown token
         response = self.client_class().post('/api/oauth2/revoke/', content_type='application/json', data={
-            'client_id': 'simple-client-id',
-            'client_secret': 'simple-client-secret',
+            'client_id': 'test-client',
+            'client_secret': 'test-client-secret',
             'token': 'unknown',
         })
         self.assertEqual(response.status_code, 200)
@@ -6770,8 +6770,8 @@ def test_refresh_token(self):
         def refresh_token_tester(username: str, password: str, anon = False):
             # Create refresh_token
             response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
-                'client_id': 'simple-client-id',
-                'client_secret': 'simple-client-secret',
+                'client_id': 'test-client',
+                'client_secret': 'test-client-secret',
                 'grant_type': 'password',
                 'username': username,
                 'password': password,
@@ -6782,8 +6782,8 @@ def refresh_token_tester(username: str, password: str, anon = False):
             # Refresh token
             response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
                 'grant_type': 'refresh_token',
-                'client_id': 'simple-client-id',
-                'client_secret': 'simple-client-secret',
+                'client_id': 'test-client',
+                'client_secret': 'test-client-secret',
                 'refresh_token': refresh_token,
             })
             data = response.json()
@@ -6803,8 +6803,8 @@ def refresh_token_tester(username: str, password: str, anon = False):
             # Check invalid refresh token
             response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
                 'grant_type': 'refresh_token',
-                'client_id': 'simple-client-id',
-                'client_secret': 'simple-client-secret',
+                'client_id': 'test-client',
+                'client_secret': 'test-client-secret',
                 'refresh_token': 'invalid',
             })
             data = response.json()
@@ -6831,8 +6831,8 @@ def test_session(self):
         def session_tester(username: str, password: str):
             user = self._create_user(is_super_user=False, is_staff=False)
             auth_data = {
-                'client_id': 'simple-client-id',
-                'client_secret': 'simple-client-secret',
+                'client_id': 'test-client',
+                'client_secret': 'test-client-secret',
                 'grant_type': 'password',
                 'username': user.username,
                 'password': user.data['password'],
@@ -6890,8 +6890,8 @@ def test_anon_user_login(self):
             '/api/oauth2/token/',
             content_type='application/json',
             data={
-                'client_id': 'simple-client-id',
-                'client_secret': 'simple-client-secret',
+                'client_id': 'test-client',
+                'client_secret': 'test-client-secret',
                 'grant_type': 'password',
                 'username': '',
                 'password': '',
@@ -6913,8 +6913,8 @@ def test_anon_user_login(self):
             'sub': access_token_jwt['sub'],
             'jti': access_token_jwt['jti'],
             'anon': True,
-            'aud': 'simple-client-id',
-            'client_id': 'simple-client-id',
+            'aud': 'test-client',
+            'client_id': 'test-client',
             'iss': 'https://test_proj.vst',
             'scope': None,
             'sup': False
@@ -6925,8 +6925,8 @@ def test_anon_user_login(self):
             '/api/oauth2/introspect/',
             content_type='application/json',
             data={
-                'client_id': 'simple-client-id',
-                'client_secret': 'simple-client-secret',
+                'client_id': 'test-client',
+                'client_secret': 'test-client-secret',
                 'token': access_token,
             },
         )
@@ -6960,6 +6960,7 @@ def test_schema(self):
             'flow': 'password',
             'tokenUrl': 'http://testserver/api/oauth2/token/',
             'scopes': {},
+            'x-clientId': 'simple-client-id',
         })
 
         self.assertDictEqual(schema['paths']['/userinfo/'], {
@@ -7155,8 +7156,8 @@ def test_userinfo(self):
             username='j.doe'
         )
         token = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
-            'client_id': 'simple-client-id',
-            'client_secret': 'simple-client-secret',
+            'client_id': 'test-client',
+            'client_secret': 'test-client-secret',
             'grant_type': 'password',
             'username': user.username,
             'password': user.data['password'],
@@ -7177,8 +7178,8 @@ def test_userinfo(self):
     def test_auth_with_scope(self):
         user = self._create_user(is_super_user=False, is_staff=False,)
         response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
-            'client_id': 'simple-client-id',
-            'client_secret': 'simple-client-secret',
+            'client_id': 'test-client',
+            'client_secret': 'test-client-secret',
             'grant_type': 'password',
             'username': user.username,
             'password': user.data['password'],
@@ -7194,8 +7195,8 @@ def test_auth_with_scope(self):
     def test_token_introspection_endpoint(self):
         # Check invalid token
         response = self.client_class().post('/api/oauth2/introspect/', content_type='application/json', data={
-            'client_id': 'simple-client-id',
-            'client_secret': 'simple-client-secret',
+            'client_id': 'test-client',
+            'client_secret': 'test-client-secret',
             'token': 'abc',
         })
         self.assertEqual(response.status_code, 200)
@@ -7206,8 +7207,8 @@ def test_token_introspection_endpoint(self):
         # Check valid token
         user = self._create_user(is_super_user=False, is_staff=False,)
         response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
-            'client_id': 'simple-client-id',
-            'client_secret': 'simple-client-secret',
+            'client_id': 'test-client',
+            'client_secret': 'test-client-secret',
             'grant_type': 'password',
             'username': user.username,
             'password': user.data['password'],
@@ -7216,8 +7217,8 @@ def test_token_introspection_endpoint(self):
         access_token = response.json()['access_token']
 
         response = self.client_class().post('/api/oauth2/introspect/', content_type='application/json', data={
-            'client_id': 'simple-client-id',
-            'client_secret': 'simple-client-secret',
+            'client_id': 'test-client',
+            'client_secret': 'test-client-secret',
             'token': access_token,
         })
         self.assertEqual(response.status_code, 200)
@@ -7238,6 +7239,7 @@ def test_schema_security_definition(self):
                     'scopes': {},
                     'tokenUrl': 'https://some.auth/token',
                     'type': 'oauth2',
+                    'x-clientId': 'simple-client-id',
                 },
             )
 
@@ -7249,6 +7251,7 @@ def test_schema_security_definition(self):
                     'scopes': {},
                     'tokenUrl': 'https://some-vstutils.auth/api/oauth2/token/',
                     'type': 'oauth2',
+                    'x-clientId': 'simple-client-id',
                 },
             )
 
@@ -7259,6 +7262,7 @@ def test_schema_security_definition(self):
                 'scopes': {},
                 'tokenUrl': 'https://test_proj.vst/api/oauth2/token/',
                 'type': 'oauth2',
+                'x-clientId': 'simple-client-id',
             },
         )
 
@@ -7289,8 +7293,8 @@ def test_ldap_auth(self, ldap_obj):
         user.save()
 
         response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
-            'client_id': 'simple-client-id',
-            'client_secret': 'simple-client-secret',
+            'client_id': 'test-client',
+            'client_secret': 'test-client-secret',
             'grant_type': 'password',
             'username': 'ldap_user',
             'password': 'some_password',
@@ -7308,15 +7312,14 @@ def test_same_origin_client_auth(self):
             '/api/oauth2/token/',
             content_type='application/json',
             data={
-                'client_id': 'spa',
-                'client_secret': 'spa',
+                'client_id': 'simple-client-id',
                 'grant_type': 'password',
                 'username': user.username,
                 'password': user.data['password'],
             },
             headers={'Sec-Fetch-Site': 'same-origin'},
         )
-        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.status_code, 200, response.json())
 
     def test_authorization_in_vary(self):
         user = self._create_user(is_super_user=False, is_staff=False)
@@ -7324,8 +7327,8 @@ def test_authorization_in_vary(self):
             '/api/oauth2/token/',
             content_type='application/json',
             data={
-                'client_id': 'simple-client-id',
-                'client_secret': 'simple-client-secret',
+                'client_id': 'test-client',
+                'client_secret': 'test-client-secret',
                 'grant_type': 'password',
                 'username': user.username,
                 'password': user.data['password'],
@@ -7517,8 +7520,8 @@ def test_authorization_code_grant_with_pkce(self):
     def test_bulk_request_will_not_revoke_token(self):
         user = self._create_user(is_super_user=False, is_staff=False,)
         response = self.client_class().post('/api/oauth2/token/', content_type='application/json', data={
-            'client_id': 'simple-client-id',
-            'client_secret': 'simple-client-secret',
+            'client_id': 'test-client',
+            'client_secret': 'test-client-secret',
             'grant_type': 'password',
             'username': user.username,
             'password': user.data['password'],
diff --git a/test_src/test_proj/webpushes.py b/test_src/test_proj/webpushes.py
index 23fdcf4a..9f2255b1 100644
--- a/test_src/test_proj/webpushes.py
+++ b/test_src/test_proj/webpushes.py
@@ -51,3 +51,10 @@ class StaffOnlyNotification(BaseWebPushNotification):
     @staticmethod
     def is_available(user):
         return user.is_staff
+
+
+class NotificationFromOtherApp(BaseWebPushNotification):
+    """
+    Webpush notification from other project that should not be available in ui
+    """
+    project = 'other_project'
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 9f48bb04..285b5e80 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b6'
+__version__: str = '5.10.0b7'
diff --git a/vstutils/oauth2/authorization_server.py b/vstutils/oauth2/authorization_server.py
index 15370587..c72f5bca 100644
--- a/vstutils/oauth2/authorization_server.py
+++ b/vstutils/oauth2/authorization_server.py
@@ -13,6 +13,9 @@
     ResourceOwnerPasswordCredentialsGrant as BaseResourceOwnerPasswordCredentialsGrant,
     TokenMixin,
 )
+from authlib.oauth2.rfc6749.authenticate_client import (
+    _validate_client,
+)
 from authlib.oauth2.rfc7009 import (
     RevocationEndpoint as BaseRevocationEndpoint,
 )
@@ -32,7 +35,7 @@
 from vstutils.utils import get_session_store
 
 from .authorization_code import AuthorizationCodeGrant, OpenIDCode
-from .client import query_simple_client, SameOriginSpaClient, SimpleClient
+from .client import query_simple_client, SimpleClient
 from .jwk import jwk_set
 from .requests import DjangoOAuth2Request, DjangoOAuthJsonRequest
 from .user import UserWrapper
@@ -275,9 +278,15 @@ def introspect_token(self, token: JWTBearerToken):
         }
 
 
-def same_origin_auth_method(query_client, request):
+def same_origin_client_secret_post(query_client, request):
     if request.headers.get('Sec-Fetch-Site') == 'same-origin':
-        return SameOriginSpaClient()
+        data = request.form
+        client_id = data.get('client_id')
+        if client_id:
+            client_secret = data.get('client_secret')
+            client = _validate_client(query_client, client_id, request.state)
+            if client.check_client_secret(client_secret):
+                return client
 
 
 class AuthorizationServer(BaseAuthorizationServer):
@@ -320,7 +329,10 @@ def __init__(self):
         )
         self.register_endpoint(SessionRefreshTokenRevocationEndpoint)
         self.register_endpoint(IntrospectionEndpoint)
-        self.register_client_auth_method('same_origin', same_origin_auth_method)
+        self.register_client_auth_method(
+            'same_origin_client_secret_post',
+            same_origin_client_secret_post,
+        )
 
     def create_oauth2_request(self, request):
         if request.content_type == 'application/json':
diff --git a/vstutils/oauth2/client.py b/vstutils/oauth2/client.py
index 46ab0814..b9b76349 100644
--- a/vstutils/oauth2/client.py
+++ b/vstutils/oauth2/client.py
@@ -57,15 +57,6 @@ def get_default_redirect_uri(self):
         return self.default_redirect_uri
 
 
-class SameOriginSpaClient(SimpleClient):
-    def __init__(self):
-        super().__init__(
-            id='spa',
-            allowed_grant_types=['password', 'refresh_token'],
-            token_endpoint_auth_methods=['same_origin'],
-        )
-
-
 def query_simple_client(client_id: str):
     if client_id in settings.OAUTH_SERVER_CLIENTS:
         return SimpleClient(
diff --git a/vstutils/settings.py b/vstutils/settings.py
index 99c95156..d5412f07 100644
--- a/vstutils/settings.py
+++ b/vstutils/settings.py
@@ -447,7 +447,6 @@ class OAuthServerSection(cconfig.Section):
         'server_id_token_expires_in': ConfigIntSecondsType,
         'server_client_authentication_methods': ConfigListType,
         'server_authorization_endpoint': ConfigStringType,
-        'server_enable_same_origin_client_auth': ConfigBoolType,
         'server_simple_client_id': ConfigStringType,
         'server_simple_client_secret': ConfigStringType,
     }
@@ -620,13 +619,12 @@ class DjangoEnv(environ.Env):
             'server_token_expires_in': 864000,
             'server_id_token_expires_in': 3600,
             'server_client_authentication_methods': [
-                'same_origin',
+                'same_origin_client_secret_post',
                 'client_secret_post',
                 'client_secret_basic',
                 'none',
             ],
             'server_authorization_endpoint': '',
-            'server_enable_same_origin_client_auth': True,
             'server_simple_client_id': 'simple-client-id',
             'server_simple_client_secret': 'simple-client-secret',
         },
@@ -1527,7 +1525,7 @@ class OauthServerClientConfig(_t.TypedDict):
     token_endpoint_auth_methods: _t.Optional[
         list[
             _t.Literal[
-                'same_origin',
+                'same_origin_client_secret_post',
                 'client_secret_post',
                 'client_secret_basic',
                 'none',
@@ -1540,10 +1538,17 @@ class OauthServerClientConfig(_t.TypedDict):
 
 OAUTH_SERVER_URL: str = config['oauth']['server_url']
 OAUTH_SERVER_TOKEN_ENDPOINT_PATH: str = config['oauth']['server_token_endpoint_path']
-OAUTH_SERVER_SCHEMA_CLIENT_ID: str = config['oauth']['server_schema_client_id']
+OAUTH_SERVER_SCHEMA_CLIENT_ID: str = (
+    config['oauth']['server_schema_client_id'] or
+    config['oauth']['server_simple_client_id']
+)
 
 OAUTH_SERVER_ENABLE: bool = config['oauth']['server_enable']
-OAUTH_SERVER_ISSUER: str = env.str(f'{ENV_NAME}_OAUTH_SERVER_ISSUER', None) or config['oauth']['server_issuer']
+OAUTH_SERVER_ISSUER: str = (
+    env.str(f'{ENV_NAME}_OAUTH_SERVER_ISSUER', None) or
+    config['oauth']['server_issuer'] or
+    VST_PROJECT
+)
 OAUTH_SERVER_CLASS: str = config['oauth']['server_class']
 OAUTH_SERVER_ENABLE_ANON_LOGIN: bool = config['oauth']['server_enable_anon_login']
 OAUTH_SERVER_PASSWORD_GRANT_ADDITIONAL_EXTENSIONS: list[str] = []
@@ -1558,9 +1563,11 @@ class OauthServerClientConfig(_t.TypedDict):
 OAUTH_SERVER_AUTHORIZATION_CODE_CACHE_NAME: str = 'session'
 OAUTH_SERVER_CLIENTS: OauthServerClientsConfig = {
     config['oauth']['server_simple_client_id']: {
-        'secret': config['oauth']['server_simple_client_secret'],
-        'token_endpoint_auth_methods': ['same_origin', 'client_secret_post', 'client_secret_basic'],
+        'token_endpoint_auth_methods': [
+            'same_origin_client_secret_post',
+        ],
         'allowed_grant_types': ['password', 'refresh_token'],
+        'secret': None,
         'allowed_redirect_uris': None,
         'allowed_response_types': None,
         'default_redirect_uri': None,
diff --git a/vstutils/webpush/autodiscovery.py b/vstutils/webpush/autodiscovery.py
index 937e7be0..c4fb1d47 100644
--- a/vstutils/webpush/autodiscovery.py
+++ b/vstutils/webpush/autodiscovery.py
@@ -21,7 +21,10 @@ def _is_custom_class(obj: type) -> bool:
         try:
             module = importlib.import_module(app_config.name + ".webpushes")
             for obj in module.__dict__.values():
-                if _is_custom_class(obj):
+                if _is_custom_class(obj) and (
+                    obj.project is None or
+                    obj.project == settings.VST_PROJECT
+                ):
                     classes.add(obj)
         except ImportError:
             pass
diff --git a/vstutils/webpush/base.py b/vstutils/webpush/base.py
index 1e7450b6..e5663eca 100644
--- a/vstutils/webpush/base.py
+++ b/vstutils/webpush/base.py
@@ -49,12 +49,13 @@ class BaseWebPush:
     frontend, but you can add custom service worker code to handle it.
     """
     json_renderer = ORJSONRenderer()
-
+    project: Optional[str] = None
     title: Optional[str] = None
+    key: Optional[str] = None
 
     @classmethod
     def get_key(cls) -> str:
-        return (cls.__module__ + '_' + cls.__name__).replace('.', '_')
+        return cls.key or (cls.__module__ + '_' + cls.__name__).replace('.', '_')
 
     def send(self):
         subscriptions = tuple(self.get_subscriptions())

From f00409251be5b1f9311b549372d1cfdc6dbe9a01 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite@mail.ru>
Date: Fri, 14 Jun 2024 14:43:18 +1000
Subject: [PATCH 19/46] Release 5.10.0b8

---
 test_src/test_proj/tests.py                 | 39 ++++++++++++++++++++-
 vstutils/__init__.py                        |  2 +-
 vstutils/api/endpoint.py                    | 14 ++++++--
 vstutils/api/routers.py                     |  6 ----
 vstutils/api/schema/generators.py           | 25 ++++++++++++-
 vstutils/api/schema/schema.py               | 19 +++++++++-
 vstutils/asgi.py                            |  2 +-
 vstutils/oauth2/authorization_server.py     | 13 ++++---
 vstutils/oauth2/client.py                   |  2 +-
 vstutils/settings.py                        |  7 +++-
 vstutils/templates/drf-yasg/swagger-ui.html | 21 +++++++++++
 11 files changed, 130 insertions(+), 20 deletions(-)

diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index 0f34dd0d..acd82f63 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -3298,10 +3298,11 @@ def test_user_language_detection(self):
         self.assertEqual(to_soup(response.content).html['lang'], 'en')
 
     def test_server_translation(self):
+        self._logout(self.client)
         bulk_data = [
             dict(path=['_lang', 'ru'], method='get'),
         ]
-        results = self.bulk(bulk_data)
+        results = self.bulk(bulk_data, relogin=False)
         ru_lang_obj = Language.objects.get(code='ru')
 
         self.assertEqual(results[0]['status'], 200)
@@ -6987,6 +6988,7 @@ def test_schema(self):
                         },
                     }
                 },
+                'security': [{'oauth2': []}],
                 "tags": ["userinfo"],
                 "x-list": True,
             },
@@ -7038,6 +7040,7 @@ def test_schema(self):
                         },
                     },
                 },
+                'security': [],
                 "tags": ["token"],
             },
         })
@@ -7086,6 +7089,7 @@ def test_schema(self):
                         },
                     }
                 },
+                'security': [],
                 "tags": ["introspect"],
             },
         })
@@ -7112,6 +7116,7 @@ def test_schema(self):
                     }
                 ],
                 "responses": {"200": {"description": "Token revoked"}},
+                'security': [],
                 "tags": ["revoke"],
             },
         })
@@ -7321,6 +7326,38 @@ def test_same_origin_client_auth(self):
         )
         self.assertEqual(response.status_code, 200, response.json())
 
+        # with auth header
+        response = self.client_class().post(
+            '/api/oauth2/token/',
+            content_type='application/json',
+            data={
+                'grant_type': 'password',
+                'username': user.username,
+                'password': user.data['password'],
+            },
+            headers={
+                'Sec-Fetch-Site': 'same-origin',
+                'Authorization': f'Basic {base64.b64encode("simple-client-id:".encode("utf-8")).decode("utf-8")}'
+            },
+        )
+        self.assertEqual(response.status_code, 200, response.json())
+
+        # with not-basic auth header
+        response = self.client_class().post(
+            '/api/oauth2/token/',
+            content_type='application/json',
+            data={
+                'grant_type': 'password',
+                'username': user.username,
+                'password': user.data['password'],
+            },
+            headers={
+                'Sec-Fetch-Site': 'same-origin',
+                'Authorization': f'Bearer {base64.b64encode("simple-client-id:".encode("utf-8")).decode("utf-8")}'
+            },
+        )
+        self.assertEqual(response.status_code, 401, response.json())
+
     def test_authorization_in_vary(self):
         user = self._create_user(is_super_user=False, is_staff=False)
         token = self.client_class().post(
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 285b5e80..d2a3b15e 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b7'
+__version__: str = '5.10.0b8'
diff --git a/vstutils/api/endpoint.py b/vstutils/api/endpoint.py
index f970ea59..e7dd4a30 100644
--- a/vstutils/api/endpoint.py
+++ b/vstutils/api/endpoint.py
@@ -9,11 +9,11 @@
 from django.conf import settings
 from django.db import transaction
 from django.http import HttpResponse, HttpRequest
-from django.contrib.auth.models import AbstractUser
+from django.contrib.auth.models import AbstractUser, AnonymousUser
 from django.test.client import Client, ClientHandler
 from django.test.utils import modify_settings
 from drf_yasg.views import SPEC_RENDERERS
-from rest_framework import serializers, views, versioning, request as drf_request
+from rest_framework import serializers, views, versioning, request as drf_request, exceptions
 from rest_framework.authentication import (
     SessionAuthentication,
     BasicAuthentication,
@@ -501,6 +501,16 @@ def put(self, request: BulkRequestType, allow_fail=True) -> responses.BaseRespon
     def patch(self, request: BulkRequestType) -> responses.BaseResponseClass:
         return self.put(request)
 
+    def perform_authentication(self, request):
+        try:
+            super().perform_authentication(request)
+        except exceptions.PermissionDenied as perm_err:  # nocv
+            # Required for some reasons when bulk request has both session and token
+            if perm_err.detail.startswith('CSRF Failed: '):
+                request.user = AnonymousUser()
+            else:
+                raise
+
     def initial(self, request: drf_request.Request, *args, **kwargs):
         super().initial(request, *args, **kwargs)
         self.results: _t.List[_t.Dict[_t.Text, _t.Any]] = []
diff --git a/vstutils/api/routers.py b/vstutils/api/routers.py
index 74124035..70c15ea8 100644
--- a/vstutils/api/routers.py
+++ b/vstutils/api/routers.py
@@ -167,12 +167,6 @@ def generate(self, views_list):
                 'view': 'vstutils.api.auth.UserViewSet'
             }
 
-        if settings.OAUTH_SERVER_ENABLE and r'revoke' not in views_list:
-            views_list[r'_revoke'] = {
-                'view': 'vstutils.oauth2.endpoints.RevokeTokenViewSet',
-                'type': 'view',
-            }
-
         super().generate(views_list)
 
 
diff --git a/vstutils/api/schema/generators.py b/vstutils/api/schema/generators.py
index 88e452df..ed012386 100644
--- a/vstutils/api/schema/generators.py
+++ b/vstutils/api/schema/generators.py
@@ -61,6 +61,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if not self.version:
             self.version = settings.VST_API_VERSION
+        self.required_security_definitions = set()
 
     def _get_hooks(self):
         return map(
@@ -134,6 +135,12 @@ def should_include_endpoint(self, path, method, view, public):
             view = get_nested_view_obj(view, nested_view, sub_action, method)
         return super().should_include_endpoint(path, method, view, public)
 
+    def get_operation(self, *args, **kwargs):
+        operation = super().get_operation(*args, **kwargs)
+        for secDef in operation.get('security') or []:
+            self.required_security_definitions.add(tuple(secDef.keys())[0])
+        return operation
+
     def get_operation_keys(self, subpath, method, view):
         keys = super().get_operation_keys(subpath, method, view)
         subpath_keys = list(filter(bool, subpath.split('/')))
@@ -150,7 +157,22 @@ def get_schema(self, request: drf_request.Request = None, *args, **kwargs):  # t
         if not getattr(request, 'version', ''):
             request.version = self.version
         result = super().get_schema(request, *args, **kwargs)
-        result['securityDefinitions']['oauth2'] = get_oauth2_security_definition(request)
+
+        # Security definitions
+        if 'oauth2' in self.required_security_definitions:
+            result['securityDefinitions']['oauth2'] = get_oauth2_security_definition(request)
+        if 'session' in self.required_security_definitions:
+            result['securityDefinitions']['session'] = {
+                'type': 'apiKey',
+                'name': settings.SESSION_COOKIE_NAME,
+                'in': 'cookie',
+            }
+        if 'basic' in self.required_security_definitions:
+            result['securityDefinitions']['basic'] = {
+                'type': 'basic',
+            }
+
+        # Add to schema centrifugo params
         if request and getattr(request, 'accepted_media_type', None) == 'application/openapi+json':
             result['info']['x-user-id'] = request.user.pk
             if (notificator := getattr(request, 'notificator', None)) and request.user.is_authenticated:
@@ -169,6 +191,7 @@ def get_schema(self, request: drf_request.Request = None, *args, **kwargs):  # t
                     ).decode()
                     result['info']['x-centrifugo-address'] = get_centrifugo_public_address(request)
 
+        # Run hooks for schema customisation
         for hook in self._get_hooks():
             result = copy.deepcopy(result)
             hook(request=request, schema=result)
diff --git a/vstutils/api/schema/schema.py b/vstutils/api/schema/schema.py
index 4b7f52df..a70a2ca5 100644
--- a/vstutils/api/schema/schema.py
+++ b/vstutils/api/schema/schema.py
@@ -4,7 +4,7 @@
 from warnings import warn
 
 from django.http import FileResponse
-from rest_framework import status, serializers, views
+from rest_framework import status, serializers, views, authentication, permissions
 from drf_yasg.inspectors.view import SwaggerAutoSchema
 from drf_yasg.app_settings import swagger_settings
 from drf_yasg.openapi import Schema, Response, Operation, Parameter, IN_HEADER, TYPE_STRING
@@ -13,6 +13,7 @@
 from ...models.base import get_proxy_labels
 from ..decorators import NestedWithAppendMixin
 from ..base import detail_actions, main_actions, CachableHeadMixin
+from ...oauth2.authentication import JWTBearerTokenAuthentication
 from . import inspectors as vst_inspectors
 
 if _t.TYPE_CHECKING:
@@ -150,6 +151,22 @@ def get_default_response_serializer(self):
                         result = Schema(type='file')
         return result or super().get_default_response_serializer()
 
+    def get_security(self):
+        result = super().get_security()
+
+        result = result or []
+        if (pm := self._sch.view.get_permissions()) and any(not isinstance(p, permissions.AllowAny) for p in pm):
+            for auth_class in self._sch.view.get_authenticators():
+                if isinstance(auth_class, JWTBearerTokenAuthentication):
+                    # TODO: provide scopes usage
+                    result.append({"oauth2": []})
+                elif isinstance(auth_class, authentication.SessionAuthentication):
+                    result.append({"session": []})
+                elif isinstance(auth_class, authentication.BasicAuthentication):
+                    result.append({"basic": []})
+
+        return result
+
 
 class VSTAutoSchema(ExtendedSwaggerAutoSchema):
     field_inspectors = [
diff --git a/vstutils/asgi.py b/vstutils/asgi.py
index 4ee190c8..34c4578b 100644
--- a/vstutils/asgi.py
+++ b/vstutils/asgi.py
@@ -103,7 +103,7 @@ async def api_live_check():
 async def add_server_timing_header(request: Request, call_next):
     start_time = time.monotonic()
     response = await call_next(request)
-    response.headers['Server-Timing'] = f'full;dur={round((time.monotonic()-start_time)*1000, 2)}'
+    response.headers['Server-Timing'] = f'total_full;dur={round((time.monotonic()-start_time)*1000, 2)}'
     return response
 
 if not settings.API_ONLY:
diff --git a/vstutils/oauth2/authorization_server.py b/vstutils/oauth2/authorization_server.py
index c72f5bca..2371c517 100644
--- a/vstutils/oauth2/authorization_server.py
+++ b/vstutils/oauth2/authorization_server.py
@@ -13,9 +13,7 @@
     ResourceOwnerPasswordCredentialsGrant as BaseResourceOwnerPasswordCredentialsGrant,
     TokenMixin,
 )
-from authlib.oauth2.rfc6749.authenticate_client import (
-    _validate_client,
-)
+from authlib.oauth2.rfc6749.authenticate_client import _validate_client, extract_basic_authorization
 from authlib.oauth2.rfc7009 import (
     RevocationEndpoint as BaseRevocationEndpoint,
 )
@@ -244,7 +242,8 @@ def get_user(self):
             return UserWrapper(user)
 
     def revoke(self):
-        self._session.delete()
+        if self._session:
+            self._session.delete()
 
     def check_client(self, client: 'SimpleClient'):
         return client.get_client_id() == self.claims['client_id']
@@ -280,7 +279,11 @@ def introspect_token(self, token: JWTBearerToken):
 
 def same_origin_client_secret_post(query_client, request):
     if request.headers.get('Sec-Fetch-Site') == 'same-origin':
-        data = request.form
+        if 'client_id' in request.form:
+            data = request.form
+        else:
+            data = dict(zip(('client_id', 'client_secret'), extract_basic_authorization(request.headers)))
+
         client_id = data.get('client_id')
         if client_id:
             client_secret = data.get('client_secret')
diff --git a/vstutils/oauth2/client.py b/vstutils/oauth2/client.py
index b9b76349..1b41782c 100644
--- a/vstutils/oauth2/client.py
+++ b/vstutils/oauth2/client.py
@@ -34,7 +34,7 @@ def get_client_id(self):
         return self.id
 
     def check_client_secret(self, client_secret):
-        return self.secret == client_secret
+        return self.secret == client_secret or (self.secret is None and not client_secret)
 
     def check_endpoint_auth_method(self, method, endpoint):
         if endpoint == 'token':
diff --git a/vstutils/settings.py b/vstutils/settings.py
index d5412f07..abcb7b40 100644
--- a/vstutils/settings.py
+++ b/vstutils/settings.py
@@ -3,6 +3,7 @@
 import gc
 import pwd
 import sys
+from hashlib import blake2s
 from tempfile import gettempdir
 
 import environ
@@ -1554,7 +1555,11 @@ class OauthServerClientConfig(_t.TypedDict):
 OAUTH_SERVER_PASSWORD_GRANT_ADDITIONAL_EXTENSIONS: list[str] = []
 OAUTH_SERVER_AUTHORIZATION_CODE_GRANT_ADDITIONAL_EXTENSIONS: list[str] = []
 OAUTH_SERVER_JWT_ALG: str = config['oauth']['server_jwt_alg']
-OAUTH_SERVER_JWT_KEY: str = env.str(f'{ENV_NAME}_OAUTH_SERVER_JWT_KEY', None) or config['oauth']['server_jwt_key']
+OAUTH_SERVER_JWT_KEY: str = (
+    env.str(f'{ENV_NAME}_OAUTH_SERVER_JWT_KEY', None)
+    or config['oauth'].get('server_jwt_key', fallback=None)
+)
+OAUTH_SERVER_JWT_KEY = OAUTH_SERVER_JWT_KEY or blake2s(SECRET_KEY.encode()).hexdigest()
 OAUTH_SERVER_JWT_EXTRA_CLAIMS_PROVIDER: _t.Optional[str] = config['oauth']['server_jwt_extra_claims_provider']
 OAUTH_SERVER_TOKEN_EXPIRES_IN: int = config['oauth']['server_token_expires_in']
 OAUTH_SERVER_ID_TOKEN_EXPIRES_IN: int = config['oauth']['server_id_token_expires_in']
diff --git a/vstutils/templates/drf-yasg/swagger-ui.html b/vstutils/templates/drf-yasg/swagger-ui.html
index a705324b..f7f38ecf 100644
--- a/vstutils/templates/drf-yasg/swagger-ui.html
+++ b/vstutils/templates/drf-yasg/swagger-ui.html
@@ -2,3 +2,24 @@
 {% load static %}
 
 {% block title %}{{ project_gui_name }} – OpenApi</title>{% endblock %}
+
+{% block extra_scripts %}
+    <script type="application/javascript">
+        swaggerUiConfig.responseInterceptor = function (response) {
+            // Parse the response body to modify it
+            let body = JSON.parse(response.text);
+
+            // Remove specific authentication method
+            const authMethodToHide = 'session'; // Replace with the actual method name
+            if (body.securityDefinitions && body.securityDefinitions[authMethodToHide]) {
+                delete body.securityDefinitions[authMethodToHide];
+            }
+
+            // Convert the modified body back to JSON string
+            response.text = JSON.stringify(body);
+
+            return response;
+        }
+        window.addEventListener('load', initSwaggerUi);
+    </script>
+{% endblock %}
\ No newline at end of file

From 67dbb399db31a2029becc80381d8ad2ea9f04e72 Mon Sep 17 00:00:00 2001
From: Dmitriy Ovcharenko <ovcharenkodd@gmail.com>
Date: Tue, 18 Jun 2024 13:24:58 +1000
Subject: [PATCH 20/46] Chore(frontend): Update npm dependencies

---
 frontend_src/vite.config.ts                   |  12 +-
 .../vstutils/fields/FieldsResolver.ts         |   4 +-
 .../fields/base/defineFieldComponent.ts       |  21 +-
 .../fk/deep-fk/DeepFKFieldContentEditable.vue |   2 +-
 frontend_src/vstutils/models/Model.ts         |   2 +-
 frontend_src/vstutils/schema.ts               |   2 +-
 frontend_src/vstutils/utils/index.ts          |   4 +-
 package.json                                  |  47 +-
 yarn.lock                                     | 805 +++++++++---------
 9 files changed, 430 insertions(+), 469 deletions(-)

diff --git a/frontend_src/vite.config.ts b/frontend_src/vite.config.ts
index d555bca4..5a05dbaa 100644
--- a/frontend_src/vite.config.ts
+++ b/frontend_src/vite.config.ts
@@ -1,6 +1,6 @@
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { type PluginOption, defineConfig } from 'vite';
+import { defineConfig } from 'vite';
 import vue from '@vitejs/plugin-vue2';
 import dts from 'vite-plugin-dts';
 import tsconfigPaths from 'vite-tsconfig-paths';
@@ -9,9 +9,9 @@ const currentDir = dirname(fileURLToPath(import.meta.url));
 
 const frontendSrc = currentDir;
 
-export default defineConfig({
+export default defineConfig(() => ({
     plugins: [
-        tsconfigPaths({ root: frontendSrc }) as PluginOption,
+        tsconfigPaths({ root: frontendSrc }),
         vue(),
         dts({
             insertTypesEntry: true,
@@ -25,10 +25,10 @@ export default defineConfig({
                 index: join(frontendSrc, 'index.ts'),
                 'auth-app': join(frontendSrc, 'auth-app.ts'),
             },
-            formats: ['es'],
+            formats: ['es' as const],
         },
         rollupOptions: {
-            external: ['vue'],
+            external: ['vue', /@toast-ui\/vue-editor/, /@toast-ui\/editor/],
         },
     },
     resolve: {
@@ -48,4 +48,4 @@ export default defineConfig({
             reportsDirectory: join(frontendSrc, '..', 'node_modules', '.coverage'),
         },
     },
-});
+}));
diff --git a/frontend_src/vstutils/fields/FieldsResolver.ts b/frontend_src/vstutils/fields/FieldsResolver.ts
index 5a9911e4..2d2dc01d 100644
--- a/frontend_src/vstutils/fields/FieldsResolver.ts
+++ b/frontend_src/vstutils/fields/FieldsResolver.ts
@@ -21,7 +21,7 @@ export class FieldsResolver {
     _schema: AppSchema;
     _types = new Map<
         ParameterType,
-        Map<string | typeof FieldsResolver['DEFAULT_FIELD_KEY'], new (options: any) => Field>
+        Map<string | (typeof FieldsResolver)['DEFAULT_FIELD_KEY'], new (options: any) => Field>
     >([
         ['string', new Map()],
         ['number', new Map()],
@@ -48,7 +48,7 @@ export class FieldsResolver {
 
     registerField(
         type: ParameterType,
-        format: string | typeof FieldsResolver['DEFAULT_FIELD_KEY'],
+        format: string | (typeof FieldsResolver)['DEFAULT_FIELD_KEY'],
         fieldClass: new (options: any) => Field,
     ) {
         const typeMap = this._types.get(type);
diff --git a/frontend_src/vstutils/fields/base/defineFieldComponent.ts b/frontend_src/vstutils/fields/base/defineFieldComponent.ts
index 773b81b7..f0627d19 100644
--- a/frontend_src/vstutils/fields/base/defineFieldComponent.ts
+++ b/frontend_src/vstutils/fields/base/defineFieldComponent.ts
@@ -4,7 +4,7 @@ import BaseFieldMixin from './BaseFieldMixin.vue';
 import { FieldEditEmitsNames, FieldEmitsDef, FieldEmitsNames, FieldReadonlyEmitsNames } from './emits';
 import { FieldEditPropsDef, FieldPropsDef, FieldReadonlyPropsDef } from './props';
 
-import type { SetupContext, VNode } from 'vue';
+import type { SetupFunction } from 'vue';
 import type { LooseRequired } from 'vue/types/common';
 import type { FieldEditEmitsDefType, FieldEmitsDefType, FieldReadonlyEmitsDefType } from './emits';
 import type {
@@ -15,20 +15,23 @@ import type {
     FieldReadonlyPropsDefType,
 } from './props';
 import type { Field } from './BaseField';
+import { EmitsOptions } from 'vue/types/v3-setup-context';
+
+type VueSetup<Props, Emits extends EmitsOptions> = SetupFunction<Readonly<LooseRequired<Props>>, {}, Emits>;
 
 // --- Edit component ---
 
-export type FieldEditSetupFunction<TField extends Field> = (
-    props: Readonly<LooseRequired<FieldEditProps<TField>>>,
-    context: SetupContext<FieldEditEmitsDefType<TField>>,
-) => () => VNode | null;
+export type FieldEditSetupFunction<TField extends Field> = VueSetup<
+    FieldEditProps<TField>,
+    FieldEditEmitsDefType<TField>
+>;
 
 // --- Readonly and list components ---
 
-export type FieldReadonlySetupFunction<TField extends Field> = (
-    props: Readonly<LooseRequired<FieldReadonlyProps<TField>>>,
-    context: SetupContext<FieldReadonlyEmitsDefType<TField>>,
-) => () => VNode | null;
+export type FieldReadonlySetupFunction<TField extends Field> = VueSetup<
+    FieldReadonlyProps<TField>,
+    FieldReadonlyEmitsDefType<TField>
+>;
 
 // --- Main component ---
 
diff --git a/frontend_src/vstutils/fields/fk/deep-fk/DeepFKFieldContentEditable.vue b/frontend_src/vstutils/fields/fk/deep-fk/DeepFKFieldContentEditable.vue
index 3d57ebb4..e1d99726 100644
--- a/frontend_src/vstutils/fields/fk/deep-fk/DeepFKFieldContentEditable.vue
+++ b/frontend_src/vstutils/fields/fk/deep-fk/DeepFKFieldContentEditable.vue
@@ -16,7 +16,7 @@
     const props = defineProps(FieldEditPropsDef as FieldEditPropsDefType<DeepFKField>);
     const emit = defineEmits(FieldEditEmitsDef as FieldEditEmitsDefType<DeepFKField>);
 
-    function setValue(value: typeof props['value'][], options?: SetFieldValueParams) {
+    function setValue(value: (typeof props)['value'][], options?: SetFieldValueParams) {
         if (value && value.length === 0 && !props.value) {
             return;
         }
diff --git a/frontend_src/vstutils/models/Model.ts b/frontend_src/vstutils/models/Model.ts
index c4c42eb3..3be38a4d 100644
--- a/frontend_src/vstutils/models/Model.ts
+++ b/frontend_src/vstutils/models/Model.ts
@@ -72,7 +72,7 @@ export class BaseModel implements Model {
     static hideNotRequired?: boolean;
     static additionalProperties?: Field | undefined;
     static additionalPropertiesGroup = '';
-    static displayMode: typeof MODEL_MODES[number] = 'DEFAULT';
+    static displayMode: (typeof MODEL_MODES)[number] = 'DEFAULT';
     static visibilityDataFieldName?: string;
 
     _queryset?: QuerySet;
diff --git a/frontend_src/vstutils/schema.ts b/frontend_src/vstutils/schema.ts
index 916d02c4..1b544a89 100644
--- a/frontend_src/vstutils/schema.ts
+++ b/frontend_src/vstutils/schema.ts
@@ -59,7 +59,7 @@ export type ModelDefinition = swagger.Schema & {
     'x-non-bulk-methods'?: HttpMethod[];
     'x-translate-model'?: string;
     'x-hide-not-required'?: boolean;
-    'x-display-mode'?: typeof MODEL_MODES[number];
+    'x-display-mode'?: (typeof MODEL_MODES)[number];
     'x-visibility-data-field-name'?: string;
 };
 
diff --git a/frontend_src/vstutils/utils/index.ts b/frontend_src/vstutils/utils/index.ts
index a31c2804..66f8ac3c 100644
--- a/frontend_src/vstutils/utils/index.ts
+++ b/frontend_src/vstutils/utils/index.ts
@@ -21,7 +21,7 @@ export const HttpMethods = {
     DELETE: 'delete',
 } as const;
 
-export type HttpMethod = typeof HttpMethods[keyof typeof HttpMethods];
+export type HttpMethod = (typeof HttpMethods)[keyof typeof HttpMethods];
 
 export enum BulkType {
     SIMPLE = 'put',
@@ -142,7 +142,7 @@ export const RequestTypes = {
     REMOVE: 'remove',
 } as const;
 
-export type RequestType = typeof RequestTypes[keyof typeof RequestTypes];
+export type RequestType = (typeof RequestTypes)[keyof typeof RequestTypes];
 
 /**
  * Method, that converts query object into string
diff --git a/package.json b/package.json
index 950a1f31..6983f320 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,9 @@
     "lint": "conc --group --timings npm:lint:*",
     "test": "vitest -c frontend_src/vite.config.ts run"
   },
-  "dependencies": {},
+  "dependencies": {
+    "@toast-ui/vue-editor": "^3.2.3"
+  },
   "peerDependencies": {
     "vue": "^2.7.16"
   },
@@ -51,28 +53,27 @@
   },
   "devDependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
-    "@rushstack/eslint-patch": "^1.10.2",
-    "@testing-library/dom": "^9.3.4",
+    "@rushstack/eslint-patch": "^1.10.3",
+    "@testing-library/dom": "^10.1.0",
     "@testing-library/user-event": "^14.5.2",
-    "@toast-ui/vue-editor": "^3.2.3",
     "@types/bootstrap": "4.6.0",
     "@types/jquery": "^3.5.14",
-    "@types/papaparse": "^5.3.5",
+    "@types/papaparse": "^5.3.14",
     "@types/qrcode": "^1.5.5",
-    "@types/swagger-schema-official": "^2.0.22",
+    "@types/swagger-schema-official": "^2.0.25",
     "@vitejs/plugin-vue2": "^2.3.1",
-    "@vitest/coverage-istanbul": "^1.5.1",
+    "@vitest/coverage-istanbul": "^1.6.0",
     "@vstconsulting/tabsignal": "^2.0.0",
     "@vue/eslint-config-typescript": "^13.0.0",
-    "@vue/test-utils": "^1.3.0",
-    "@vueuse/core": "^10.9.0",
+    "@vue/test-utils": "^1.3.6",
+    "@vueuse/core": "^10.11.0",
     "admin-lte": "3.2.0-rc",
     "ansi_up": "^5.0.0",
     "bootstrap": "4.6.0",
-    "centrifuge": "^2.8.0",
+    "centrifuge": "^2.8.5",
     "compressorjs": "^1.2.1",
-    "concurrently": "^8.2.1",
-    "cropperjs": "^1.6.1",
+    "concurrently": "^8.2.2",
+    "cropperjs": "^1.6.2",
     "eslint": "^8.6.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
@@ -80,34 +81,34 @@
     "eslint-plugin-vitest-globals": "^1.5.0",
     "eslint-plugin-vue": "^9.25.0",
     "html5-qrcode": "^2.3.8",
-    "imask": "^7.6.0",
+    "imask": "^7.6.1",
     "izitoast": "1.4.0",
     "jquery": "3.7.1",
     "jquery-slimscroll": "1.3.8",
     "jquery-touchswipe": "^1.6.19",
     "jquery.scrollto": "2.1.3",
-    "jsbarcode": "^3.11.5",
-    "jsdom": "^24.0.0",
+    "jsbarcode": "^3.11.6",
+    "jsdom": "^24.1.0",
     "liquor-tree": "^0.2.70",
-    "md5": "^2.2.1",
+    "md5": "^2.3.0",
     "moment": "^2.30.1",
     "moment-timezone": "^0.5.45",
     "oidc-client-ts": "^3.0.1",
     "papaparse": "^5.4.1",
     "pinia": "^2.1.7",
     "portal-vue": "^2.1.7",
-    "prettier": "^2.8.1",
+    "prettier": "^2.8.8",
     "qrcode": "^1.5.3",
-    "sass": "^1.47.0",
+    "sass": "^1.77.5",
     "select2": "4.1.0-rc.0",
     "select2-bootstrap-5-theme": "^1.3.0",
-    "swiper": "^11.1.1",
-    "typescript": "^5.2.2",
+    "swiper": "^11.1.4",
+    "typescript": "^5.4.5",
     "visibilityjs": "^2.0.2",
-    "vite": "^5.2.9",
-    "vite-plugin-dts": "^3.8.3",
+    "vite": "^5.3.1",
+    "vite-plugin-dts": "^3.9.1",
     "vite-tsconfig-paths": "^4.3.2",
-    "vitest": "^1.5.0",
+    "vitest": "^1.6.0",
     "vitest-fetch-mock": "^0.2.2",
     "vue": "^2.7.16",
     "vue-i18n": "^8.28.2",
diff --git a/yarn.lock b/yarn.lock
index 47db9bdd..76672414 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -237,116 +237,231 @@
   resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537"
   integrity sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==
 
+"@esbuild/aix-ppc64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f"
+  integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==
+
 "@esbuild/android-arm64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz#db1c9202a5bc92ea04c7b6840f1bbe09ebf9e6b9"
   integrity sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==
 
+"@esbuild/android-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052"
+  integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==
+
 "@esbuild/android-arm@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.2.tgz#3b488c49aee9d491c2c8f98a909b785870d6e995"
   integrity sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==
 
+"@esbuild/android-arm@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28"
+  integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==
+
 "@esbuild/android-x64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.2.tgz#3b1628029e5576249d2b2d766696e50768449f98"
   integrity sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==
 
+"@esbuild/android-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e"
+  integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==
+
 "@esbuild/darwin-arm64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz#6e8517a045ddd86ae30c6608c8475ebc0c4000bb"
   integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==
 
+"@esbuild/darwin-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a"
+  integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
+
 "@esbuild/darwin-x64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0"
   integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==
 
+"@esbuild/darwin-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22"
+  integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==
+
 "@esbuild/freebsd-arm64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz#d71502d1ee89a1130327e890364666c760a2a911"
   integrity sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==
 
+"@esbuild/freebsd-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e"
+  integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==
+
 "@esbuild/freebsd-x64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz#aa5ea58d9c1dd9af688b8b6f63ef0d3d60cea53c"
   integrity sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==
 
+"@esbuild/freebsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261"
+  integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==
+
 "@esbuild/linux-arm64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz#055b63725df678379b0f6db9d0fa85463755b2e5"
   integrity sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==
 
+"@esbuild/linux-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b"
+  integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==
+
 "@esbuild/linux-arm@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz#76b3b98cb1f87936fbc37f073efabad49dcd889c"
   integrity sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==
 
+"@esbuild/linux-arm@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9"
+  integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==
+
 "@esbuild/linux-ia32@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz#c0e5e787c285264e5dfc7a79f04b8b4eefdad7fa"
   integrity sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==
 
+"@esbuild/linux-ia32@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2"
+  integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==
+
 "@esbuild/linux-loong64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz#a6184e62bd7cdc63e0c0448b83801001653219c5"
   integrity sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==
 
+"@esbuild/linux-loong64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df"
+  integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==
+
 "@esbuild/linux-mips64el@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz#d08e39ce86f45ef8fc88549d29c62b8acf5649aa"
   integrity sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==
 
+"@esbuild/linux-mips64el@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe"
+  integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==
+
 "@esbuild/linux-ppc64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz#8d252f0b7756ffd6d1cbde5ea67ff8fd20437f20"
   integrity sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==
 
+"@esbuild/linux-ppc64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4"
+  integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==
+
 "@esbuild/linux-riscv64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz#19f6dcdb14409dae607f66ca1181dd4e9db81300"
   integrity sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==
 
+"@esbuild/linux-riscv64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc"
+  integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==
+
 "@esbuild/linux-s390x@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz#3c830c90f1a5d7dd1473d5595ea4ebb920988685"
   integrity sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==
 
+"@esbuild/linux-s390x@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de"
+  integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==
+
 "@esbuild/linux-x64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz#86eca35203afc0d9de0694c64ec0ab0a378f6fff"
   integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==
 
+"@esbuild/linux-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0"
+  integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
+
 "@esbuild/netbsd-x64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz#e771c8eb0e0f6e1877ffd4220036b98aed5915e6"
   integrity sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==
 
+"@esbuild/netbsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047"
+  integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==
+
 "@esbuild/openbsd-x64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz#9a795ae4b4e37e674f0f4d716f3e226dd7c39baf"
   integrity sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==
 
+"@esbuild/openbsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70"
+  integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==
+
 "@esbuild/sunos-x64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz#7df23b61a497b8ac189def6e25a95673caedb03f"
   integrity sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==
 
+"@esbuild/sunos-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b"
+  integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==
+
 "@esbuild/win32-arm64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz#f1ae5abf9ca052ae11c1bc806fb4c0f519bacf90"
   integrity sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==
 
+"@esbuild/win32-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d"
+  integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==
+
 "@esbuild/win32-ia32@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz#241fe62c34d8e8461cd708277813e1d0ba55ce23"
   integrity sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==
 
+"@esbuild/win32-ia32@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b"
+  integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==
+
 "@esbuild/win32-x64@0.20.2":
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc"
   integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==
 
+"@esbuild/win32-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c"
+  integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==
+
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
@@ -404,14 +519,14 @@
     brfs "^2.0.2"
     unicode-trie "^2.0.0"
 
-"@foliojs-fork/pdfkit@^0.13.0":
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/@foliojs-fork/pdfkit/-/pdfkit-0.13.0.tgz#54f5368d8cf74d8edc81a175ccda1fd9655f2db9"
-  integrity sha512-YXeG1fml9k97YNC9K8e292Pj2JzGt9uOIiBFuQFxHsdQ45BlxW+JU3RQK6JAvXU7kjhjP8rCcYvpk36JLD33sQ==
+"@foliojs-fork/pdfkit@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@foliojs-fork/pdfkit/-/pdfkit-0.14.0.tgz#ed1868050edd2904284655f8dcddd56b49576c98"
+  integrity sha512-nMOiQAv6id89MT3tVTCgc7HxD5ZMANwio2o5yvs5sexQkC0KI3BLaLakpsrHmFfeGFAhqPmZATZGbJGXTUebpg==
   dependencies:
     "@foliojs-fork/fontkit" "^1.9.1"
     "@foliojs-fork/linebreak" "^1.1.1"
-    crypto-js "^4.0.0"
+    crypto-js "^4.2.0"
     png-js "^1.0.0"
 
 "@foliojs-fork/restructure@^2.0.2":
@@ -751,15 +866,15 @@
   resolved "https://registry.yarnpkg.com/@sweetalert2/theme-bootstrap-4/-/theme-bootstrap-4-4.0.5.tgz#488eac0a85e7601a42dc8b1d95ec8fc73ff330aa"
   integrity sha512-pe5mQ98sgrphNVq6Xe5BsWxsfI1Z8zT9C2oux6+4B6Qt30qYo58Q+bnzRs8pV95O9/URt/QJZyl+R8SabMeW6g==
 
-"@testing-library/dom@^9.3.4":
-  version "9.3.4"
-  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-9.3.4.tgz#50696ec28376926fec0a1bf87d9dbac5e27f60ce"
-  integrity sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==
+"@testing-library/dom@^10.1.0":
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-10.1.0.tgz#2d073e49771ad614da999ca48f199919e5176fb6"
+  integrity sha512-wdsYKy5zupPyLCW2Je5DLHSxSfbIp6h80WoHOQc+RPtmPGA52O9x5MJEkv92Sjonpq+poOAtUKhh1kBGAXBrNA==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/runtime" "^7.12.5"
     "@types/aria-query" "^5.0.1"
-    aria-query "5.1.3"
+    aria-query "5.3.0"
     chalk "^4.1.0"
     dom-accessibility-api "^0.5.9"
     lz-string "^1.5.0"
@@ -853,10 +968,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a"
   integrity sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==
 
-"@types/papaparse@^5.3.5":
-  version "5.3.9"
-  resolved "https://registry.yarnpkg.com/@types/papaparse/-/papaparse-5.3.9.tgz#5f955949eae512c1eec70bba4bfeb2e7f4396564"
-  integrity sha512-sZcrKD63qA4/6GyBcVvX6AIp0AkpfyYk00CUQHMBvb4+OVXTZWyXUvidUZaai1wyKUVyJoxO7mgREam/pMRrDw==
+"@types/papaparse@^5.3.14":
+  version "5.3.14"
+  resolved "https://registry.yarnpkg.com/@types/papaparse/-/papaparse-5.3.14.tgz#345cc2a675a90106ff1dc33b95500dfb30748031"
+  integrity sha512-LxJ4iEFcpqc6METwp9f6BV6VVc43m6MfH0VqFosHvrUgfXiFe6ww7R3itkOQ+TCK6Y+Iv/+RnnvtRZnkc5Kc9g==
   dependencies:
     "@types/node" "*"
 
@@ -998,44 +1113,44 @@
     picocolors "^1.0.0"
     test-exclude "^6.0.0"
 
-"@vitest/expect@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-1.5.0.tgz#961190510a2723bd4abf5540bcec0a4dfd59ef14"
-  integrity sha512-0pzuCI6KYi2SIC3LQezmxujU9RK/vwC1U9R0rLuGlNGcOuDWxqWKu6nUdFsX9tH1WU0SXtAxToOsEjeUn1s3hA==
+"@vitest/expect@1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-1.6.0.tgz#0b3ba0914f738508464983f4d811bc122b51fb30"
+  integrity sha512-ixEvFVQjycy/oNgHjqsL6AZCDduC+tflRluaHIzKIsdbzkLn2U/iBnVeJwB6HsIjQBdfMR8Z0tRxKUsvFJEeWQ==
   dependencies:
-    "@vitest/spy" "1.5.0"
-    "@vitest/utils" "1.5.0"
+    "@vitest/spy" "1.6.0"
+    "@vitest/utils" "1.6.0"
     chai "^4.3.10"
 
-"@vitest/runner@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-1.5.0.tgz#1f7cb78ee4064e73e53d503a19c1b211c03dfe0c"
-  integrity sha512-7HWwdxXP5yDoe7DTpbif9l6ZmDwCzcSIK38kTSIt6CFEpMjX4EpCgT6wUmS0xTXqMI6E/ONmfgRKmaujpabjZQ==
+"@vitest/runner@1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-1.6.0.tgz#a6de49a96cb33b0e3ba0d9064a3e8d6ce2f08825"
+  integrity sha512-P4xgwPjwesuBiHisAVz/LSSZtDjOTPYZVmNAnpHHSR6ONrf8eCJOFRvUwdHn30F5M1fxhqtl7QZQUk2dprIXAg==
   dependencies:
-    "@vitest/utils" "1.5.0"
+    "@vitest/utils" "1.6.0"
     p-limit "^5.0.0"
     pathe "^1.1.1"
 
-"@vitest/snapshot@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-1.5.0.tgz#cd2d611fd556968ce8fb6b356a09b4593c525947"
-  integrity sha512-qpv3fSEuNrhAO3FpH6YYRdaECnnRjg9VxbhdtPwPRnzSfHVXnNzzrpX4cJxqiwgRMo7uRMWDFBlsBq4Cr+rO3A==
+"@vitest/snapshot@1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-1.6.0.tgz#deb7e4498a5299c1198136f56e6e0f692e6af470"
+  integrity sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==
   dependencies:
     magic-string "^0.30.5"
     pathe "^1.1.1"
     pretty-format "^29.7.0"
 
-"@vitest/spy@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-1.5.0.tgz#1369a1bec47f46f18eccfa45f1e8fbb9b5e15e77"
-  integrity sha512-vu6vi6ew5N5MMHJjD5PoakMRKYdmIrNJmyfkhRpQt5d9Ewhw9nZ5Aqynbi3N61bvk9UvZ5UysMT6ayIrZ8GA9w==
+"@vitest/spy@1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-1.6.0.tgz#362cbd42ccdb03f1613798fde99799649516906d"
+  integrity sha512-leUTap6B/cqi/bQkXUu6bQV5TZPx7pmMBKBQiI0rJA8c3pB56ZsaTbREnF7CJfmvAS4V2cXIBAh/3rVwrrCYgw==
   dependencies:
     tinyspy "^2.2.0"
 
-"@vitest/utils@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-1.5.0.tgz#90c9951f4516f6d595da24876b58e615f6c99863"
-  integrity sha512-BDU0GNL8MWkRkSRdNFvCUCAVOeHaUlVJ9Tx0TYBZyXaaOTmGtUFObzchCivIBrIwKzvZA7A9sCejVhXM2aY98A==
+"@vitest/utils@1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-1.6.0.tgz#5c5675ca7d6f546a7b4337de9ae882e6c57896a1"
+  integrity sha512-21cPiuGMoMZwiOHa2i4LXkMkMkCGzA+MVFV70jRwHo95dL4x/ts5GZhML1QWuy7yfp3WzK3lRvZi3JnXTYqrBw==
   dependencies:
     diff-sequences "^29.6.3"
     estree-walker "^3.0.3"
@@ -1346,20 +1461,12 @@ argparse@~1.0.9:
   dependencies:
     sprintf-js "~1.0.2"
 
-aria-query@5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e"
-  integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==
-  dependencies:
-    deep-equal "^2.0.5"
-
-array-buffer-byte-length@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead"
-  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
+aria-query@5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e"
+  integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==
   dependencies:
-    call-bind "^1.0.2"
-    is-array-buffer "^3.0.1"
+    dequal "^2.0.3"
 
 array-from@^2.1.1:
   version "2.1.1"
@@ -1400,11 +1507,6 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-available-typed-arrays@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
-  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -1587,7 +1689,7 @@ caniuse-lite@^1.0.30001587:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001612.tgz#d34248b4ec1f117b70b24ad9ee04c90e0b8a14ae"
   integrity sha512-lFgnZ07UhaCcsSZgWW0K5j4e69dK1u/ltrL9lTUiFOwNHs12S3UMIEYgBV0Z6C6hRDev7iRnMzzYmKabYdXF9g==
 
-centrifuge@^2.8.0:
+centrifuge@^2.8.5:
   version "2.8.5"
   resolved "https://registry.yarnpkg.com/centrifuge/-/centrifuge-2.8.5.tgz#94accdd105ddffe026f05994eaedc21e1ba82339"
   integrity sha512-t06HyieeB2k7uSJSbVM4e7xMF+mfY8xvDtTJLF95ho0ba/X4MSoZcisi2PBzdCLyxG2BhkYW1Wcg6RUiPYTIlQ==
@@ -1698,9 +1800,9 @@ clone@^1.0.4:
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
 codemirror@^5.62.3:
-  version "5.65.15"
-  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.15.tgz#66899278f44a7acde0eb641388cd563fe6dfbe19"
-  integrity sha512-YC4EHbbwQeubZzxLl5G4nlbLc1T21QTrKGaOal/Pkm9dVDMZXMH7+ieSPEOZCtO9I68i8/oteJKOxzHC2zR+0g==
+  version "5.65.16"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.16.tgz#efc0661be6bf4988a6a1c2fe6893294638cdb334"
+  integrity sha512-br21LjYmSlVL0vFCPWPfhzUCT34FM/pAdK7rRIZwa0rrtrIdotvP4Oh4GUHsu2E3IrQMCfRkL/fN3ytMNxVQvg==
 
 color-convert@^1.9.0, color-convert@^1.9.3:
   version "1.9.3"
@@ -1771,10 +1873,10 @@ concat-stream@~1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concurrently@^8.2.1:
-  version "8.2.1"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.2.1.tgz#bcab9cacc38c23c503839583151e0fa96fd5b584"
-  integrity sha512-nVraf3aXOpIcNud5pB9M82p1tynmZkrSGQ1p6X/VY8cJ+2LMVqAgXsJxYYefACSHbTYlm92O1xuhdGTjwoEvbQ==
+concurrently@^8.2.2:
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.2.2.tgz#353141985c198cfa5e4a3ef90082c336b5851784"
+  integrity sha512-1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg==
   dependencies:
     chalk "^4.1.2"
     date-fns "^2.30.0"
@@ -1830,10 +1932,10 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-cropperjs@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/cropperjs/-/cropperjs-1.6.1.tgz#fd132021d93b824b1b0f2c2c3b763419fb792d89"
-  integrity sha512-F4wsi+XkDHCOMrHMYjrTEE4QBOrsHHN5/2VsVAaRq8P7E5z7xQpT75S+f/9WikmBEailas3+yo+6zPIomW+NOA==
+cropperjs@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/cropperjs/-/cropperjs-1.6.2.tgz#d1a5d627d880581cca41b7901f06923500e4201b"
+  integrity sha512-nhymn9GdnV3CqiEHJVai54TULFAE3VshJTXSqSJKa8yXAKyBKDWdhHarnlIPrshJ0WMFTGuFvG02YjLXfPiuOA==
 
 cross-fetch@^3.0.6:
   version "3.1.8"
@@ -1856,7 +1958,7 @@ crypt@0.0.2:
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
   integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
 
-crypto-js@^4.0.0:
+crypto-js@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
   integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==
@@ -1916,6 +2018,14 @@ datatables.net-autofill@>=2.3.7:
     datatables.net ">=1.10.25"
     jquery ">=1.7"
 
+"datatables.net-bs4@1.11 - 2", datatables.net-bs4@>=1.11.0:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-2.0.8.tgz#aae2657f4bef93a0043b901e523e62e4178f21d0"
+  integrity sha512-AUnimPFMpduIPuU/w0C35EEtRdpblsQ/1Qr3OXN1qX5JjDC4ZWK63Xbhqd1XoA/jubDUjXHkxQVfCqhtygS4rw==
+  dependencies:
+    datatables.net "2.0.8"
+    jquery ">=1.7"
+
 datatables.net-bs4@>=1.10.25:
   version "1.11.3"
   resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.11.3.tgz#04817c5d9457f1b9807a1330f12c37a541596328"
@@ -1924,14 +2034,6 @@ datatables.net-bs4@>=1.10.25:
     datatables.net ">=1.10.25"
     jquery ">=1.7"
 
-datatables.net-bs4@>=1.13.4, datatables.net-bs4@^1.11.2:
-  version "1.13.6"
-  resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.13.6.tgz#171ac930cbb68cd1a337e80040bddf537f3845a7"
-  integrity sha512-+ZYDvpvCf0L0qSXPGKbb17arFPNqnjkyrvAEamR9SGQaGK7PprVaNTLmRfP0Xq2dBxVYr+Y+OD/q63zaDo0cSA==
-  dependencies:
-    datatables.net ">=1.13.4"
-    jquery ">=1.7"
-
 datatables.net-bs4@^1.10.15:
   version "1.10.21"
   resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.10.21.tgz#7a9ae489ebbd815cd869292450d284edd0f44697"
@@ -1940,6 +2042,14 @@ datatables.net-bs4@^1.10.15:
     datatables.net "1.10.21"
     jquery ">=1.7"
 
+datatables.net-bs4@^1.11.2, datatables.net-bs4@^1.13.0:
+  version "1.13.11"
+  resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.13.11.tgz#b31b9006f1901746e6c835925523608bd0a29025"
+  integrity sha512-1LnxzQDFKpwvBETc8wtUtQ+pUXhs6NJomNST5pRzzHAccckkj9rZeOp3mevKDnDJKuNhBM1Y0rIeZGylJnqh9A==
+  dependencies:
+    datatables.net "1.13.11"
+    jquery "1.8 - 4"
+
 datatables.net-buttons-bs4@^1.7.1:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/datatables.net-buttons-bs4/-/datatables.net-buttons-bs4-1.7.1.tgz#d2fdef1f1b4073129d42806d24b8f037e9bd473b"
@@ -1958,20 +2068,20 @@ datatables.net-buttons@1.7.1:
     jquery ">=1.7"
 
 datatables.net-colreorder-bs4@^1.5.4:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/datatables.net-colreorder-bs4/-/datatables.net-colreorder-bs4-1.7.0.tgz#55e4e53dd70126eec4bd15cc739dbc845233a0ba"
-  integrity sha512-gKC9VHnLLvcRM2oVWvpAqfwGB6TPFTz7C7vozl51BvEvcV5N2GDVEt4rPYyVFuBFRF/wV3MMbfT3DRaJWRyatQ==
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/datatables.net-colreorder-bs4/-/datatables.net-colreorder-bs4-1.7.2.tgz#53ea3150c3a34bf67e01f159f640f8fc2c9dc201"
+  integrity sha512-iVlvHwD82ZCDuaDaAXsD6OukNjgWNe44+f0yu43a1bOwK1ncXYiBSohlEuIhynHnESexN2vg4saj4a0rEMNx+w==
   dependencies:
-    datatables.net-bs4 ">=1.13.4"
-    datatables.net-colreorder ">=1.6.2"
+    datatables.net-bs4 "^1.13.0"
+    datatables.net-colreorder "1.7.2"
     jquery ">=1.7"
 
-datatables.net-colreorder@>=1.6.2:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/datatables.net-colreorder/-/datatables.net-colreorder-1.7.0.tgz#140bdd1b9fad902edaf89b0ba1b0bcd424c524f3"
-  integrity sha512-Vyysfxe2kfjeuPJJMGRQ2jHVOfoadyBYKzizbOHzR2bhTVsIYjrbEhUA1H24TISE17SdR77X0RmcUvS/h/Bifw==
+datatables.net-colreorder@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/datatables.net-colreorder/-/datatables.net-colreorder-1.7.2.tgz#9806f165048daecb2fe93a482c744efc6e649c06"
+  integrity sha512-F8TYMFXtWLtsjciwS7hkP/Fbp3XS6WHuHLc+iMFtQqiQmbMo/59GK7YSxKuxSoqTTJU/opaPXQYjODnIuNEc/g==
   dependencies:
-    datatables.net ">=1.13.4"
+    datatables.net "^1.13.0"
     jquery ">=1.7"
 
 datatables.net-fixedcolumns-bs4@^3.3.3:
@@ -1992,20 +2102,20 @@ datatables.net-fixedcolumns@3.3.3:
     jquery ">=1.7"
 
 datatables.net-fixedheader-bs4@^3.1.9:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/datatables.net-fixedheader-bs4/-/datatables.net-fixedheader-bs4-3.4.0.tgz#5c7e98f1c613c5ed17583bc78e3a7e60ecc8ad59"
-  integrity sha512-+hEVAmSHEmxCUzGy29IX0F50NDOWSohMDx4NRlc6uGN9pCDbfSZrqHMPKBMyjwZRppsJmUaoiNrDvYIVJBjObw==
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/datatables.net-fixedheader-bs4/-/datatables.net-fixedheader-bs4-3.4.1.tgz#567aa2e41cd3972f8ce5eb76173ad397e74b597d"
+  integrity sha512-Oq6yCpswdFRn+nwrjOjD0nmpH3F0glz/ppgdT8vA6U/8qkguze4d3qZyEYd7osqrCeX9ccUZR9ptpqRYb6sVtg==
   dependencies:
-    datatables.net-bs4 ">=1.13.4"
-    datatables.net-fixedheader ">=3.3.2"
+    datatables.net-bs4 "^1.13.0"
+    datatables.net-fixedheader "3.4.1"
     jquery ">=1.7"
 
-datatables.net-fixedheader@>=3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/datatables.net-fixedheader/-/datatables.net-fixedheader-3.4.0.tgz#f08ce3bd63467aa7c11639c13634ef8219ea4b8f"
-  integrity sha512-qglLTqo/T0IJq0Lp7Ca7wEo50T1iqUO2+YeVG4Ddy6ML5f66B7mLZLzP6yy8zXACFjlRGBDEDxD0ato3g6tviA==
+datatables.net-fixedheader@3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/datatables.net-fixedheader/-/datatables.net-fixedheader-3.4.1.tgz#db8b250e7819da989baa5df8c757a5a382754752"
+  integrity sha512-c9FJAShG5r8RJDIszWQvMFe6Ie+njfbHB9GhzOPjEF7zhbsMUQEkoYq1qW3ppOxY5psadDrT+D3f4iGM589u6w==
   dependencies:
-    datatables.net ">=1.13.4"
+    datatables.net "^1.13.0"
     jquery ">=1.7"
 
 datatables.net-keytable-bs4@^2.6.4:
@@ -2043,20 +2153,20 @@ datatables.net-responsive@2.2.9:
     jquery ">=1.7"
 
 datatables.net-rowgroup-bs4@^1.1.3:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/datatables.net-rowgroup-bs4/-/datatables.net-rowgroup-bs4-1.4.0.tgz#ccb5ae8f394d5a65b8bf02a315b4ce5840cdc87a"
-  integrity sha512-QTZJNekVn6ebONQodkOlXNOqvbzg+7KmCs9cpzgeOg8rDXkvFDvCGBHXxHa9xUqB0LC4S8TgvgjXnDYG3GW/LQ==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/datatables.net-rowgroup-bs4/-/datatables.net-rowgroup-bs4-1.5.0.tgz#31e5ad371f187c079df8dc4275ef8b441bf4cab2"
+  integrity sha512-1CTXF2BsYwWYg3tjUw6cayRYsbt61DD3ms/8Evuz3/qrlKO6txdbp8OsmBNQJwT6qgEjPWx6tuGi8xdHGOey3A==
   dependencies:
-    datatables.net-bs4 ">=1.13.4"
-    datatables.net-rowgroup ">=1.3.1"
+    datatables.net-bs4 ">=1.11.0"
+    datatables.net-rowgroup "1.5.0"
     jquery ">=1.7"
 
-datatables.net-rowgroup@>=1.3.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/datatables.net-rowgroup/-/datatables.net-rowgroup-1.4.0.tgz#b9f22fabbeb7a1d08ca37df79eb1f2a5c626faed"
-  integrity sha512-IyiEqCBA6B49EMm/SvW2dktZvHJCybD30qvYPehQ4Jd9QfRLgQxZtNXNsv0sFG2SX7j7+QlnJoKUb2/zdt4OQw==
+datatables.net-rowgroup@1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/datatables.net-rowgroup/-/datatables.net-rowgroup-1.5.0.tgz#644b5fd7f7fc6fdb1bc4e42dfa0a9203740f31ca"
+  integrity sha512-V/CLJu7rMjxwfhZAv59emZOPw58cwnYmd8NXTTJSnqBDgOZsaC9mtVo0ejBpdqvNw5WmMPy3AJceH+ay6JQ3hA==
   dependencies:
-    datatables.net ">=1.13.4"
+    datatables.net ">=1.11.0"
     jquery ">=1.7"
 
 datatables.net-rowreorder-bs4@^1.2.8:
@@ -2094,20 +2204,20 @@ datatables.net-scroller@>=2.0.4:
     jquery ">=1.7"
 
 datatables.net-searchbuilder-bs4@^1.2.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/datatables.net-searchbuilder-bs4/-/datatables.net-searchbuilder-bs4-1.6.0.tgz#c89bbd3630e5143ce4efb0653694a59faae162d4"
-  integrity sha512-bBWeCvJTKbWDG1yWWOyMs3paK5Jx5R+nev8cYPr4FaadEBTO/uErMu3tnZTFN48hnMmjSveEPc+hyprGp+3G0A==
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/datatables.net-searchbuilder-bs4/-/datatables.net-searchbuilder-bs4-1.7.1.tgz#f127c2b9cda8f0c356c229bfa6cb55e7b3ecdfd3"
+  integrity sha512-SJuAGJzLUO4yKnn4KQUjuE+6YiWmqYhSbyqxZ2pOZ65AV3XbYPUKCqxbIxKVa9HMUMKtfrSuJ94/RrCIswCfMA==
   dependencies:
-    datatables.net-bs4 ">=1.13.4"
-    datatables.net-searchbuilder ">=1.4.2"
+    datatables.net-bs4 "1.11 - 2"
+    datatables.net-searchbuilder "1.7.1"
     jquery ">=1.7"
 
-datatables.net-searchbuilder@>=1.4.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/datatables.net-searchbuilder/-/datatables.net-searchbuilder-1.6.0.tgz#be00eba44942b5becd772f168f307bb5e86d7979"
-  integrity sha512-e66eFzaUSgbIQEx1PE0WnLzapBgls8VCTuIkmpAZSHBW8AbbHPtbIMy51G9IsPsSCSsGrHh+63vVgagfKdzhEQ==
+datatables.net-searchbuilder@1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/datatables.net-searchbuilder/-/datatables.net-searchbuilder-1.7.1.tgz#4497a59af6727ca28e2624fb074c296fe509e2ce"
+  integrity sha512-bfTZIi8BQ2dNGF0bCrAok3ohowxstYhT7kOhi6i4eeRJx631Ei9wtTWYvDl0MnTw44tgWfotCdUXGLWVVfwI1g==
   dependencies:
-    datatables.net ">=1.13.4"
+    datatables.net "1.11 - 2"
     jquery ">=1.7"
 
 datatables.net-searchpanes-bs4@^1.4.0:
@@ -2128,20 +2238,20 @@ datatables.net-searchpanes@>=1.3.0:
     jquery ">=1.7"
 
 datatables.net-select-bs4@^1.3.3:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/datatables.net-select-bs4/-/datatables.net-select-bs4-1.7.0.tgz#002999dada54f115dd1de2c7e6707be0e45e3af2"
-  integrity sha512-PAOAPVaIVxZ0FEk0BamIF4a3YVkln2swIM+be+w09OWRlUo8QXFY5LbImjZ9SdUInT7pCZfueBQh5oKSKesylg==
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/datatables.net-select-bs4/-/datatables.net-select-bs4-1.7.1.tgz#3ddd63bd69426e3fd1bc20dfd7c019305d24ccb1"
+  integrity sha512-iHG4C8RdJIpsGIGDCXofUflHN1fa2N0E83MZPuqQXh1ZBkeJzd700rnru2mJXbvFc+wM9vf0Xxr6C5YsYFprgA==
   dependencies:
-    datatables.net-bs4 ">=1.13.4"
-    datatables.net-select ">=1.6.2"
+    datatables.net-bs4 "^1.13.0"
+    datatables.net-select "1.7.1"
     jquery ">=1.7"
 
-datatables.net-select@>=1.6.2:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/datatables.net-select/-/datatables.net-select-1.7.0.tgz#a108752ee6109a49392d19fec7406c953be11665"
-  integrity sha512-ps8eL8S2gUV7EdzMraw8mfQlHXpfuc8TC2onBxdk0snP8eizPe85VhpI3r4ULvPRTTI7vcViz8E7JV8aayA2lw==
+datatables.net-select@1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/datatables.net-select/-/datatables.net-select-1.7.1.tgz#1b309b1ff92c25e5ce4b9d5af19186bdf9b34597"
+  integrity sha512-yC+GoBDVsnbaFTYKmZ2v5Bftc66zSZCYHbPYZb/ccdvxytEEudjc9R3wn6fgkOrVx3C2X/8keQc4a7EJvdOErg==
   dependencies:
-    datatables.net ">=1.13.4"
+    datatables.net "^1.13.0"
     jquery ">=1.7"
 
 datatables.net@1.10.21:
@@ -2151,6 +2261,20 @@ datatables.net@1.10.21:
   dependencies:
     jquery ">=1.7"
 
+"datatables.net@1.11 - 2", datatables.net@2.0.8, datatables.net@>=1.11.0:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.0.8.tgz#5199f0f2c26d8bba653af74cea035e9e07166768"
+  integrity sha512-4/2dYx4vl975zQqZbyoVEm0huPe61qffjBRby7K7V+y9E+ORq4R8KavkgrNMmIgO6cl85Pg4AvCbVjvPCIT1Yg==
+  dependencies:
+    jquery ">=1.7"
+
+datatables.net@1.13.11, datatables.net@^1.11.2, datatables.net@^1.13.0:
+  version "1.13.11"
+  resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.13.11.tgz#e2a4c8b50553512f241ebfcbc078d74d551183b2"
+  integrity sha512-AE6RkMXziRaqzPcu/pl3SJXeRa6fmXQG/fVjuRESujvkzqDCYEeKTTpPMuVJSGYJpPi32WGSphVNNY1G4nSN/g==
+  dependencies:
+    jquery "1.8 - 4"
+
 datatables.net@>=1.10.25:
   version "1.11.3"
   resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.11.3.tgz#80e691036efcd62467558ee64c07dd566cb761b4"
@@ -2158,13 +2282,6 @@ datatables.net@>=1.10.25:
   dependencies:
     jquery ">=1.7"
 
-datatables.net@>=1.13.4, datatables.net@^1.11.2:
-  version "1.13.6"
-  resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.13.6.tgz#6e282adbbb2732e8df495611b8bb54e19f7a943e"
-  integrity sha512-rHNcnW+yEP9me82/KmRcid5eKrqPqW3+I/p1TwqCW3c/7GRYYkDyF6aJQOQ9DNS/pw+nyr4BVpjyJ3yoZXiFPg==
-  dependencies:
-    jquery ">=1.7"
-
 datatables.net@^1.10.15:
   version "1.10.23"
   resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.10.23.tgz#59f7d7b12845183b1b379530d1385077e113ec01"
@@ -2228,30 +2345,6 @@ deep-equal@^1.0.0:
     object-keys "^1.1.1"
     regexp.prototype.flags "^1.2.0"
 
-deep-equal@^2.0.5:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.2.tgz#9b2635da569a13ba8e1cc159c2f744071b115daa"
-  integrity sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA==
-  dependencies:
-    array-buffer-byte-length "^1.0.0"
-    call-bind "^1.0.2"
-    es-get-iterator "^1.1.3"
-    get-intrinsic "^1.2.1"
-    is-arguments "^1.1.1"
-    is-array-buffer "^3.0.2"
-    is-date-object "^1.0.5"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    isarray "^2.0.5"
-    object-is "^1.1.5"
-    object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.5.0"
-    side-channel "^1.0.4"
-    which-boxed-primitive "^1.0.2"
-    which-collection "^1.0.1"
-    which-typed-array "^1.1.9"
-
 deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
@@ -2266,7 +2359,7 @@ define-data-property@^1.0.1:
     gopd "^1.0.1"
     has-property-descriptors "^1.0.0"
 
-define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
+define-properties@^1.1.3:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
   integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
@@ -2280,6 +2373,11 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
+dequal@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
+  integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
+
 dfa@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/dfa/-/dfa-1.2.0.tgz#96ac3204e2d29c49ea5b57af8d92c2ae12790657"
@@ -2393,21 +2491,6 @@ es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
     string.prototype.trimstart "^1.0.4"
     unbox-primitive "^1.0.0"
 
-es-get-iterator@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6"
-  integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
-    has-symbols "^1.0.3"
-    is-arguments "^1.1.1"
-    is-map "^2.0.2"
-    is-set "^2.0.2"
-    is-string "^1.0.7"
-    isarray "^2.0.5"
-    stop-iteration-iterator "^1.0.0"
-
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -2504,6 +2587,35 @@ esbuild@^0.20.1:
     "@esbuild/win32-ia32" "0.20.2"
     "@esbuild/win32-x64" "0.20.2"
 
+esbuild@^0.21.3:
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d"
+  integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==
+  optionalDependencies:
+    "@esbuild/aix-ppc64" "0.21.5"
+    "@esbuild/android-arm" "0.21.5"
+    "@esbuild/android-arm64" "0.21.5"
+    "@esbuild/android-x64" "0.21.5"
+    "@esbuild/darwin-arm64" "0.21.5"
+    "@esbuild/darwin-x64" "0.21.5"
+    "@esbuild/freebsd-arm64" "0.21.5"
+    "@esbuild/freebsd-x64" "0.21.5"
+    "@esbuild/linux-arm" "0.21.5"
+    "@esbuild/linux-arm64" "0.21.5"
+    "@esbuild/linux-ia32" "0.21.5"
+    "@esbuild/linux-loong64" "0.21.5"
+    "@esbuild/linux-mips64el" "0.21.5"
+    "@esbuild/linux-ppc64" "0.21.5"
+    "@esbuild/linux-riscv64" "0.21.5"
+    "@esbuild/linux-s390x" "0.21.5"
+    "@esbuild/linux-x64" "0.21.5"
+    "@esbuild/netbsd-x64" "0.21.5"
+    "@esbuild/openbsd-x64" "0.21.5"
+    "@esbuild/sunos-x64" "0.21.5"
+    "@esbuild/win32-arm64" "0.21.5"
+    "@esbuild/win32-ia32" "0.21.5"
+    "@esbuild/win32-x64" "0.21.5"
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -2892,13 +3004,6 @@ flot@^4.2.2:
   resolved "https://registry.yarnpkg.com/flot/-/flot-4.2.2.tgz#0661d9e3805c86ccd36560f9602a0d1484d60fe8"
   integrity sha512-Strct/A27o0TA25X7Z0pxKhwK4djiP1Kjeqj0tkiqrkRu1qYPqfbp5BYuxEL8CWDNtj85Uc0PnG2E2plo1+VMg==
 
-for-each@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
-  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
-  dependencies:
-    is-callable "^1.1.3"
-
 form-data@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
@@ -2947,11 +3052,6 @@ function-bind@^1.1.1, function-bind@^1.1.2:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-functions-have-names@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
-  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
-
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -2972,7 +3072,7 @@ get-func-name@^2.0.1, get-func-name@^2.0.2:
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41"
   integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
   integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
@@ -3155,7 +3255,7 @@ html5-qrcode@^2.3.8:
   resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.8.tgz#0b0cdf7a9926cfd4be530e13a51db47592adfa0d"
   integrity sha512-jsr4vafJhwoLVEDW3n1KvPnCCXWaQfRng0/EEYk1vNcQGcG/htAdhJX0be8YyqMoSz7+hZvOZSTAepsabiuhiQ==
 
-http-proxy-agent@^7.0.0:
+http-proxy-agent@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
   integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
@@ -3163,7 +3263,7 @@ http-proxy-agent@^7.0.0:
     agent-base "^7.1.0"
     debug "^4.3.4"
 
-https-proxy-agent@^7.0.2:
+https-proxy-agent@^7.0.4:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168"
   integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==
@@ -3205,10 +3305,10 @@ imagesloaded@^4.1.4:
   dependencies:
     ev-emitter "^1.0.0"
 
-imask@^7.6.0:
-  version "7.6.0"
-  resolved "https://registry.yarnpkg.com/imask/-/imask-7.6.0.tgz#ed071748cfdf6b12ac153f69878e08c4333df984"
-  integrity sha512-6EHsq1q7v5+M4Vas2MGrs2oRpxPRWPwPDiL0HmG1ikBI/0hOwvkxRhVRFQnWIlZcTG7R8iw0az5V+z868qnQ9A==
+imask@^7.6.1:
+  version "7.6.1"
+  resolved "https://registry.yarnpkg.com/imask/-/imask-7.6.1.tgz#04fa4693bf47a4a71bbf7325408e0d058a74dcad"
+  integrity sha512-sJlIFM7eathUEMChTh9Mrfw/IgiWgJqBKq2VNbyXvBZ7ev/IlO6/KQTKlV/Fm+viQMLrFLG/zCuudrLIwgK2dg==
   dependencies:
     "@babel/runtime-corejs3" "^7.24.4"
 
@@ -3259,18 +3359,9 @@ ini@^1.3.4:
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 inputmask@^5.0.6:
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/inputmask/-/inputmask-5.0.8.tgz#cd0f70b058c3291a0d4f27de25dbfc179c998bb4"
-  integrity sha512-1WcbyudPTXP1B28ozWWyFa6QRIUG4KiLoyR6LFHlpT4OfTzRqFfWgHFadNvRuMN1S9XNVz9CdNvCGjJi+uAMqQ==
-
-internal-slot@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
-  integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
-  dependencies:
-    get-intrinsic "^1.2.0"
-    has "^1.0.3"
-    side-channel "^1.0.4"
+  version "5.0.9"
+  resolved "https://registry.yarnpkg.com/inputmask/-/inputmask-5.0.9.tgz#7bf4e83f5e199c88c0edf28545dc23fa208ef4be"
+  integrity sha512-s0lUfqcEbel+EQXtehXqwCJGShutgieOaIImFKC/r4reYNvX3foyrChl6LOEvaEgxEbesePIrw1Zi2jhZaDZbQ==
 
 ion-rangeslider@^2.3.1:
   version "2.3.1"
@@ -3282,23 +3373,6 @@ is-arguments@^1.0.4:
   resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
   integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
 
-is-arguments@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
-  integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
-  integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.2.0"
-    is-typed-array "^1.1.10"
-
 is-bigint@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
@@ -3331,11 +3405,6 @@ is-buffer@^1.1.5, is-buffer@~1.1.6:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-callable@^1.1.3:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
-  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
-
 is-callable@^1.1.4, is-callable@^1.2.3:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
@@ -3348,7 +3417,7 @@ is-core-module@^2.1.0, is-core-module@^2.13.0:
   dependencies:
     hasown "^2.0.0"
 
-is-date-object@^1.0.1, is-date-object@^1.0.5:
+is-date-object@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
   integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
@@ -3377,11 +3446,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-map@^2.0.1, is-map@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127"
-  integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
-
 is-negative-zero@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
@@ -3424,32 +3488,12 @@ is-regex@^1.1.2:
     call-bind "^1.0.2"
     has-symbols "^1.0.2"
 
-is-regex@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
-  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
-  dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
-
-is-set@^2.0.1, is-set@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec"
-  integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
-
-is-shared-array-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
-  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
-  dependencies:
-    call-bind "^1.0.2"
-
 is-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
   integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
 
-is-string@^1.0.5, is-string@^1.0.7:
+is-string@^1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
   integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
@@ -3463,36 +3507,11 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typed-array@^1.1.10:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
-  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
-  dependencies:
-    which-typed-array "^1.1.11"
-
-is-weakmap@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
-  integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
-
-is-weakset@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d"
-  integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==
-  dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
-
 is-whitespace@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/is-whitespace/-/is-whitespace-0.3.0.tgz#1639ecb1be036aec69a54cbb401cfbed7114ab7f"
   integrity sha512-RydPhl4S6JwAyj0JJjshWJEFG6hNye3pZFBRZaTUfZFwGHxzppNaNOVgQuS/E/SlhrApuMXrpnK1EEIXfdo3Dg==
 
-isarray@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
-  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
-
 isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -3588,9 +3607,9 @@ jquery-touchswipe@^1.6.19:
   integrity sha512-b0BGje9reNRU3u6ksAK9QqnX7yBRgLNe/wYG7DOfyDlhBlYjayIT8bSOHmcuvptIDW/ubM9CTW/mnZf9Rohuow==
 
 jquery-ui-dist@^1.12.1:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz#899fbb3c6210de19ace10657cf844a3b97f3be70"
-  integrity sha512-oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA==
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/jquery-ui-dist/-/jquery-ui-dist-1.13.3.tgz#13c186eb403e660c96b9b7edb7ae1466eaef9974"
+  integrity sha512-qeTR3SOSQ0jgxaNXSFU6+JtxdzNUSJKgp8LCzVrVKntM25+2YBJW1Ea8B2AwjmmSHfPLy2dSlZxJQN06OfVFhg==
   dependencies:
     jquery ">=1.8.0 <4.0.0"
 
@@ -3606,7 +3625,7 @@ jquery.scrollto@2.1.3:
   dependencies:
     jquery ">=1.8"
 
-jquery@3.7.1, "jquery@>= 1.7", jquery@>=1.10, jquery@>=1.12.0, jquery@>=1.7, jquery@>=1.8, "jquery@>=1.8.0 <4.0.0", jquery@>=2.2, "jquery@^3.0 || ^2.0 || ^1.0", jquery@^3.4.0, jquery@^3.5.1, jquery@^3.6.0, jquery@^3.7.1:
+"jquery@1.8 - 4", jquery@3.7.1, "jquery@>= 1.7", jquery@>=1.10, jquery@>=1.12.0, jquery@>=1.7, jquery@>=1.8, "jquery@>=1.8.0 <4.0.0", jquery@>=2.2, "jquery@^3.0 || ^2.0 || ^1.0", jquery@^3.4.0, jquery@^3.5.1, jquery@^3.6.0, jquery@^3.7.1:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
   integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
@@ -3645,36 +3664,36 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsbarcode@^3.11.5:
+jsbarcode@^3.11.6:
   version "3.11.6"
   resolved "https://registry.yarnpkg.com/jsbarcode/-/jsbarcode-3.11.6.tgz#96e8fbc3395476e162982a6064b98a09b5ea02c0"
   integrity sha512-G5TKGyKY1zJo0ZQKFM1IIMfy0nF2rs92BLlCz+cU4/TazIc4ZH+X1GYeDRt7TKjrYqmPfTjwTBkU/QnQlsYiuA==
 
-jsdom@^24.0.0:
-  version "24.0.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-24.0.0.tgz#e2dc04e4c79da368481659818ee2b0cd7c39007c"
-  integrity sha512-UDS2NayCvmXSXVP6mpTj+73JnNQadZlr9N68189xib2tx5Mls7swlTNao26IoHv46BZJFvXygyRtyXd1feAk1A==
+jsdom@^24.1.0:
+  version "24.1.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-24.1.0.tgz#0cffdabd42c506788bfecd160e8ac22d4387f971"
+  integrity sha512-6gpM7pRXCwIOKxX47cgOyvyQDN/Eh0f1MeKySBV2xGdKtqJBLj8P25eY3EVCWo2mglDDzozR2r2MW4T+JiNUZA==
   dependencies:
     cssstyle "^4.0.1"
     data-urls "^5.0.0"
     decimal.js "^10.4.3"
     form-data "^4.0.0"
     html-encoding-sniffer "^4.0.0"
-    http-proxy-agent "^7.0.0"
-    https-proxy-agent "^7.0.2"
+    http-proxy-agent "^7.0.2"
+    https-proxy-agent "^7.0.4"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.7"
+    nwsapi "^2.2.10"
     parse5 "^7.1.2"
-    rrweb-cssom "^0.6.0"
+    rrweb-cssom "^0.7.0"
     saxes "^6.0.0"
     symbol-tree "^3.2.4"
-    tough-cookie "^4.1.3"
+    tough-cookie "^4.1.4"
     w3c-xmlserializer "^5.0.0"
     webidl-conversions "^7.0.0"
     whatwg-encoding "^3.1.1"
     whatwg-mimetype "^4.0.0"
     whatwg-url "^14.0.0"
-    ws "^8.16.0"
+    ws "^8.17.0"
     xml-name-validator "^5.0.0"
 
 jsesc@^2.5.1:
@@ -3896,7 +3915,7 @@ make-dir@^4.0.0:
   dependencies:
     semver "^7.5.3"
 
-md5@^2.2.1:
+md5@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
   integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==
@@ -4092,10 +4111,10 @@ nth-check@^2.1.1:
   dependencies:
     boolbase "^1.0.0"
 
-nwsapi@^2.2.7:
-  version "2.2.9"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.9.tgz#7f3303218372db2e9f27c27766bcfc59ae7e61c6"
-  integrity sha512-2f3F0SEEer8bBu0dsNCFF50N0cTThV1nWFYcEYFZttdW0lDAoybv9cQoK7X7/68Z89S7FoRrVjP1LPX4XRf9vg==
+nwsapi@^2.2.10:
+  version "2.2.10"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.10.tgz#0b77a68e21a0b483db70b11fad055906e867cda8"
+  integrity sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==
 
 object-inspect@^1.6.0:
   version "1.7.0"
@@ -4115,14 +4134,6 @@ object-is@^1.0.1:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
-object-is@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
-  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
 object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -4138,16 +4149,6 @@ object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
-object.assign@^4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
-  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    has-symbols "^1.0.3"
-    object-keys "^1.1.1"
-
 oidc-client-ts@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/oidc-client-ts/-/oidc-client-ts-3.0.1.tgz#be264fb87c89f74f73863646431c32cd06f5ceb7"
@@ -4318,12 +4319,12 @@ pathval@^1.1.1:
   integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==
 
 pdfmake@^0.2.2:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.2.7.tgz#a7a46532ffde032674929988393c20b075cf65e3"
-  integrity sha512-ClLpgx30H5G3EDvRW1MrA1Xih6YxEaSgIVFrOyBMgAAt62V+hxsyWAi6JNP7u1Fc5JKYAbpb4RRVw8Rhvmz5cQ==
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.2.10.tgz#a8a0ee8a5acca8f5d728e0dfe4db8be5f1b9ec6b"
+  integrity sha512-doipFnmE1UHSk+Z3wfQuVweVQqx2pE/Ns2G5gCqZmWwqjDj+mZHnZYH/ryXWoIfD+iVdZUAutgI/VHkTCN+Xrw==
   dependencies:
     "@foliojs-fork/linebreak" "^1.1.1"
-    "@foliojs-fork/pdfkit" "^0.13.0"
+    "@foliojs-fork/pdfkit" "^0.14.0"
     iconv-lite "^0.6.3"
     xmldoc "^1.1.2"
 
@@ -4417,16 +4418,11 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-"prettier@^1.18.2 || ^2.0.0":
+"prettier@^1.18.2 || ^2.0.0", prettier@^2.8.8:
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
   integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
-prettier@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.1.tgz#4e1fd11c34e2421bc1da9aea9bd8127cd0a35efc"
-  integrity sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==
-
 pretty-format@^27.0.2:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
@@ -4653,15 +4649,6 @@ regexp.prototype.flags@^1.2.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
-regexp.prototype.flags@^1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e"
-  integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.2.0"
-    set-function-name "^2.0.0"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -4758,6 +4745,11 @@ rrweb-cssom@^0.6.0:
   resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz#ed298055b97cbddcdeb278f904857629dec5e0e1"
   integrity sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==
 
+rrweb-cssom@^0.7.0:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz#c73451a484b86dd7cfb1e0b2898df4b703183e4b"
+  integrity sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==
+
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
@@ -4789,10 +4781,10 @@ safe-regex@^2.1.1:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass@^1.47.0:
-  version "1.68.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.68.0.tgz#0034b0cc9a50248b7d1702ac166fd25990023669"
-  integrity sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==
+sass@^1.77.5:
+  version "1.77.5"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.5.tgz#5f9009820297521356e962c0bed13ee36710edfe"
+  integrity sha512-oDfX1mukIlxacPdQqNb6mV2tVCrnE+P3nVYioy72V5tlk56CPNcO4TCuFcaCRKKfJ1M3lH95CleRS+dVKL2qMg==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -4869,15 +4861,6 @@ set-blocking@^2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
-set-function-name@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"
-  integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==
-  dependencies:
-    define-data-property "^1.0.1"
-    functions-have-names "^1.2.3"
-    has-property-descriptors "^1.0.0"
-
 setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
@@ -4905,15 +4888,6 @@ shell-quote@^1.8.1:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
   integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
 
-side-channel@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
-  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
-  dependencies:
-    call-bind "^1.0.0"
-    get-intrinsic "^1.0.2"
-    object-inspect "^1.9.0"
-
 siginfo@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/siginfo/-/siginfo-2.0.0.tgz#32e76c70b79724e3bb567cb9d543eb858ccfaf30"
@@ -5018,13 +4992,6 @@ std-env@^3.5.0:
   resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.7.0.tgz#c9f7386ced6ecf13360b6c6c55b8aaa4ef7481d2"
   integrity sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==
 
-stop-iteration-iterator@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4"
-  integrity sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==
-  dependencies:
-    internal-slot "^1.0.4"
-
 string-argv@~0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
@@ -5122,10 +5089,10 @@ sweetalert2@10.16.9, sweetalert2@^10.16.9:
   resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-10.16.9.tgz#8ed86f2fa811a136667a48357e204348705be8c9"
   integrity sha512-oNe+md5tmmS3fGfVHa7gVPlun7Td2oANSacnZCeghnrr3OHBi6UPVPU+GFrymwaDqwQspACilLRmRnM7aTjNPA==
 
-swiper@^11.1.1:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/swiper/-/swiper-11.1.1.tgz#5efaa222d4a47a3ac75090cfc2fda6e53e564982"
-  integrity sha512-jGmEA/fNz1lACIcY4/40ggm1Gcyv+EUivmgV/Jd2WFPsEJhbWXnRAwzZR8OPjkBLtDxmzcoYG/iiAMWfRs0YKQ==
+swiper@^11.1.4:
+  version "11.1.4"
+  resolved "https://registry.yarnpkg.com/swiper/-/swiper-11.1.4.tgz#2f8e303e8bf9e5bc40a3885fc637ae60ff27996c"
+  integrity sha512-1n7kbYJB2dFEpUHRFszq7gys/ofIBrMNibwTiMvPHwneKND/t9kImnHt6CfGPScMHgI+dWMbGTycCKGMoOO1KA==
 
 symbol-tree@^3.2.4:
   version "3.2.4"
@@ -5209,10 +5176,10 @@ toastr@^2.1.4:
   dependencies:
     jquery ">=1.12.0"
 
-tough-cookie@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
-  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
+tough-cookie@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.4.tgz#945f1461b45b5a8c76821c33ea49c3ac192c1b36"
+  integrity sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
@@ -5300,10 +5267,10 @@ typescript@5.4.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.2.tgz#0ae9cebcfae970718474fe0da2c090cad6577372"
   integrity sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==
 
-typescript@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
-  integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
+typescript@^5.4.5:
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
+  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
 
 ufo@^1.3.2:
   version "1.5.3"
@@ -5365,9 +5332,9 @@ update-browserslist-db@^1.0.13:
     picocolors "^1.0.0"
 
 uplot@^1.6.15:
-  version "1.6.26"
-  resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.26.tgz#a6012fd141ad4a71741c75af0c71283d0ade45a7"
-  integrity sha512-qN0mveL6UsP40TnHzHAJkUQvpfA3y8zSLXtXKVlJo/sLfj2+vjan/Z3g81MCZjy/hEDUFNtnLftPmETDA4s7Rg==
+  version "1.6.30"
+  resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.30.tgz#1622a96b7cb2e50622c74330823c321847cbc147"
+  integrity sha512-48oVVRALM/128ttW19F2a2xobc2WfGdJ0VJFX00099CfqbCTuML7L2OrTKxNzeFP34eo1+yJbqFSoFAp2u28/Q==
 
 uri-js@^4.2.2:
   version "4.4.1"
@@ -5408,10 +5375,10 @@ visibilityjs@^2.0.2:
   resolved "https://registry.yarnpkg.com/visibilityjs/-/visibilityjs-2.0.2.tgz#d7c466e922024bb6c413d2136d5567e71f5fdc2f"
   integrity sha512-y5sN5oGvuXXcK6s8WupOymRcqEss7kusojpScRqkT+cTCIFjul+06uSMDPMByN9DIBv/sUUnvV8BplKjqelAfw==
 
-vite-node@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-1.5.0.tgz#7f74dadfecb15bca016c5ce5ef85e5cc4b82abf2"
-  integrity sha512-tV8h6gMj6vPzVCa7l+VGq9lwoJjW8Y79vst8QZZGiuRAfijU+EEWuc0kFpmndQrWhMMhet1jdSF+40KSZUqIIw==
+vite-node@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-1.6.0.tgz#2c7e61129bfecc759478fa592754fd9704aaba7f"
+  integrity sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==
   dependencies:
     cac "^6.7.14"
     debug "^4.3.4"
@@ -5419,10 +5386,10 @@ vite-node@1.5.0:
     picocolors "^1.0.0"
     vite "^5.0.0"
 
-vite-plugin-dts@^3.8.3:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/vite-plugin-dts/-/vite-plugin-dts-3.8.3.tgz#0505bcd07897f06859d5fb8d4b6332022af90ba5"
-  integrity sha512-yRHiRosQw7MXdOhmcrVI+kRiB8YEShbSxnADNteK4eZGdEoyOkMHihvO5XOAVlOq8ng9sIqu8vVefDK1zcj3qw==
+vite-plugin-dts@^3.9.1:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/vite-plugin-dts/-/vite-plugin-dts-3.9.1.tgz#625ad388ec3956708ccec7960550a7b0a8e8909e"
+  integrity sha512-rVp2KM9Ue22NGWB8dNtWEr+KekN3rIgz1tWD050QnRGlriUCmaDwa7qA5zDEjbXg5lAXhYMSBJtx3q3hQIJZSg==
   dependencies:
     "@microsoft/api-extractor" "7.43.0"
     "@rollup/pluginutils" "^5.1.0"
@@ -5441,7 +5408,7 @@ vite-tsconfig-paths@^4.3.2:
     globrex "^0.1.2"
     tsconfck "^3.0.3"
 
-vite@^5.0.0, vite@^5.2.9:
+vite@^5.0.0:
   version "5.2.9"
   resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.9.tgz#cd9a356c6ff5f7456c09c5ce74068ffa8df743d9"
   integrity sha512-uOQWfuZBlc6Y3W/DTuQ1Sr+oIXWvqljLvS881SVmAj00d5RdgShLcuXWxseWPd4HXwiYBFW/vXHfKFeqj9uQnw==
@@ -5452,6 +5419,17 @@ vite@^5.0.0, vite@^5.2.9:
   optionalDependencies:
     fsevents "~2.3.3"
 
+vite@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.3.1.tgz#bb2ca6b5fd7483249d3e86b25026e27ba8a663e6"
+  integrity sha512-XBmSKRLXLxiaPYamLv3/hnP/KXDai1NDexN0FpkTaZXTfycHvkRHoenpgl/fvuK/kPbB6xAgoyiryAhQNxYmAQ==
+  dependencies:
+    esbuild "^0.21.3"
+    postcss "^8.4.38"
+    rollup "^4.13.0"
+  optionalDependencies:
+    fsevents "~2.3.3"
+
 vitest-fetch-mock@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/vitest-fetch-mock/-/vitest-fetch-mock-0.2.2.tgz#f6849dcf7a8e862a509e1cee2fa3bb0cb534f468"
@@ -5459,16 +5437,16 @@ vitest-fetch-mock@^0.2.2:
   dependencies:
     cross-fetch "^3.0.6"
 
-vitest@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/vitest/-/vitest-1.5.0.tgz#6ebb396bd358650011a9c96c18fa614b668365c1"
-  integrity sha512-d8UKgR0m2kjdxDWX6911uwxout6GHS0XaGH1cksSIVVG8kRlE7G7aBw7myKQCvDI5dT4j7ZMa+l706BIORMDLw==
-  dependencies:
-    "@vitest/expect" "1.5.0"
-    "@vitest/runner" "1.5.0"
-    "@vitest/snapshot" "1.5.0"
-    "@vitest/spy" "1.5.0"
-    "@vitest/utils" "1.5.0"
+vitest@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/vitest/-/vitest-1.6.0.tgz#9d5ad4752a3c451be919e412c597126cffb9892f"
+  integrity sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==
+  dependencies:
+    "@vitest/expect" "1.6.0"
+    "@vitest/runner" "1.6.0"
+    "@vitest/snapshot" "1.6.0"
+    "@vitest/spy" "1.6.0"
+    "@vitest/utils" "1.6.0"
     acorn-walk "^8.3.2"
     chai "^4.3.10"
     debug "^4.3.4"
@@ -5482,7 +5460,7 @@ vitest@^1.5.0:
     tinybench "^2.5.1"
     tinypool "^0.8.3"
     vite "^5.0.0"
-    vite-node "1.5.0"
+    vite-node "1.6.0"
     why-is-node-running "^2.2.2"
 
 vue-demi@>=0.14.5, vue-demi@>=0.14.7:
@@ -5618,32 +5596,11 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-collection@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
-  integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
-  dependencies:
-    is-map "^2.0.1"
-    is-set "^2.0.1"
-    is-weakmap "^2.0.1"
-    is-weakset "^2.0.1"
-
 which-module@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
   integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
 
-which-typed-array@^1.1.11, which-typed-array@^1.1.9:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
-  integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
-  dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
-
 which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@@ -5687,10 +5644,10 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-ws@^8.16.0:
-  version "8.16.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.16.0.tgz#d1cd774f36fbc07165066a60e40323eab6446fd4"
-  integrity sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==
+ws@^8.17.0:
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
+  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
 
 xml-name-validator@^4.0.0:
   version "4.0.0"

From d7707a7eec6326083bdc2ac9ddb983cb5aa2c2ed Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite@mail.ru>
Date: Tue, 18 Jun 2024 14:42:42 +1000
Subject: [PATCH 21/46] Release 5.10.0b9

---
 frontend_src/cache.ts                         |  4 +-
 frontend_src/vstutils/api-fetch.ts            |  7 +-
 frontend_src/vstutils/cleanCacheHelpers.js    |  1 +
 frontend_src/vstutils/init-app.ts             |  7 +-
 package.json                                  |  2 +-
 pyproject.toml                                |  3 +
 setup.py                                      |  2 +-
 test_src/test_proj/settings.py                | 16 +++-
 test_src/test_proj/suburls.py                 | 21 ++++-
 .../templates/test_view_template.html         |  3 +
 test_src/test_proj/tests.py                   | 50 +++++++-----
 test_src/test_proj/views.py                   |  2 +
 vstutils/__init__.py                          |  2 +-
 vstutils/admin_urls.py                        | 13 ++++
 vstutils/api/renderers.py                     |  2 +-
 vstutils/asgi.py                              | 34 ++++++++
 vstutils/gui/pwa_manifest.py                  |  5 --
 vstutils/gui/views.py                         | 15 ----
 vstutils/oauth2/authentication.py             |  2 +-
 vstutils/oauth2/authorization_server.py       | 25 ++++--
 vstutils/oauth2/endpoints.py                  |  7 +-
 vstutils/settings.py                          | 32 ++++----
 vstutils/templates/400.html                   | 11 ---
 vstutils/templates/403.html                   |  8 --
 vstutils/templates/404.html                   |  8 --
 vstutils/templates/500.html                   |  6 --
 .../templates/auth/language_selector.html     | 17 ----
 vstutils/templates/base.html                  | 77 ++++---------------
 vstutils/templates/base_error.html            | 10 ---
 vstutils/templates/go_back_button.html        | 11 ---
 vstutils/templates/gui/base.html              | 11 ---
 vstutils/templates/gui/gui.html               |  1 -
 .../registration/base_agreements.html         |  5 +-
 .../templates/registration/confirm_email.html |  2 +-
 vstutils/tests.py                             |  1 +
 vstutils/urls.py                              | 15 ----
 yarn.lock                                     | 65 ++++++++--------
 37 files changed, 227 insertions(+), 276 deletions(-)
 create mode 100644 test_src/test_proj/templates/test_view_template.html
 create mode 100644 vstutils/admin_urls.py
 delete mode 100644 vstutils/templates/400.html
 delete mode 100644 vstutils/templates/403.html
 delete mode 100644 vstutils/templates/404.html
 delete mode 100644 vstutils/templates/500.html
 delete mode 100644 vstutils/templates/auth/language_selector.html
 mode change 100755 => 100644 vstutils/templates/base.html
 delete mode 100644 vstutils/templates/base_error.html
 delete mode 100644 vstutils/templates/go_back_button.html
 delete mode 100644 vstutils/templates/gui/base.html
 delete mode 100755 vstutils/templates/gui/gui.html

diff --git a/frontend_src/cache.ts b/frontend_src/cache.ts
index 7e706e87..44a64c20 100644
--- a/frontend_src/cache.ts
+++ b/frontend_src/cache.ts
@@ -97,9 +97,9 @@ function isLocalStorageAvailable() {
     }
 }
 
-export function getCache(): Cache {
+export function getCache(storage = window.sessionStorage): Cache {
     if (isLocalStorageAvailable()) {
-        return new StorageCache(window.localStorage);
+        return new StorageCache(storage);
     }
     return new DummyCache();
 }
diff --git a/frontend_src/vstutils/api-fetch.ts b/frontend_src/vstutils/api-fetch.ts
index d5344aa9..060cc0f4 100644
--- a/frontend_src/vstutils/api-fetch.ts
+++ b/frontend_src/vstutils/api-fetch.ts
@@ -20,9 +20,12 @@ function addHeadersToRequest(request: Request, headers: Record<string, string>):
 }
 
 function createOauth2Fetch(config: InitAppConfig, _fetch: InternalFetch): InternalFetch {
-    const userManger = config.auth.userManager;
+    const userManager = config.auth.userManager;
     return async (request: Request) => {
-        const user = await userManger.getUser();
+        let user = await userManager.getUser();
+        if (!user || user.expired) {
+            user = await userManager.signinSilent();
+        }
         if (!user) {
             throw new Error('User is not logged in');
         }
diff --git a/frontend_src/vstutils/cleanCacheHelpers.js b/frontend_src/vstutils/cleanCacheHelpers.js
index 681635d8..4173e672 100644
--- a/frontend_src/vstutils/cleanCacheHelpers.js
+++ b/frontend_src/vstutils/cleanCacheHelpers.js
@@ -27,6 +27,7 @@ async function cleanAllCacheAndReloadPage({ resetAll = false } = {}) {
     } finally {
         if (resetAll) {
             localStorage.clear();
+            sessionStorage.clear();
         } else {
             localStorage.removeItem('gui_version');
             localStorage.removeItem('gui_user_version');
diff --git a/frontend_src/vstutils/init-app.ts b/frontend_src/vstutils/init-app.ts
index 18e2d497..4806641c 100644
--- a/frontend_src/vstutils/init-app.ts
+++ b/frontend_src/vstutils/init-app.ts
@@ -131,6 +131,7 @@ export async function _createUserManager(config: InitAppConfigRaw, apiConfig: Ap
         client_secret: providedConfig.clientSecret,
         redirect_uri: providedConfig.redirectUri ?? 'not_used',
         monitorSession: true,
+        automaticSilentRenew: true,
         scope: '',
         userStore: new WebStorageStateStore({ store: window.localStorage }),
     });
@@ -180,7 +181,7 @@ function registerSw() {
     }
 }
 
-async function isUserLoggedIn(config: InitAppConfig) {
+async function isUserLoggedIn(config: InitAppConfig): Promise<boolean> {
     const userManager = config.auth.userManager;
     if (!(await userManager.getUser())) {
         return false;
@@ -199,12 +200,13 @@ async function loadSchema(config: InitAppConfig) {
     window.schemaLoader = schemaLoader;
     const schema = await schemaLoader.loadSchema();
     signals.emit('openapi.loaded', schema);
+    sessionStorage.setItem('defaultSchema', JSON.stringify(schema));
     return schema;
 }
 
 function createSchemaOauthConfigProvider(apiConfig: ApiConfig) {
     const loadSchemaOnce = (() => {
-        let schema: AppSchema | null = null;
+        let schema: AppSchema | null = JSON.parse(sessionStorage.getItem('defaultSchema') || 'null');
 
         return async (): Promise<AppSchema> => {
             if (schema) {
@@ -214,6 +216,7 @@ function createSchemaOauthConfigProvider(apiConfig: ApiConfig) {
             url.searchParams.set('format', 'openapi');
             const response = await fetch(url);
             schema = await response.json();
+            sessionStorage.setItem('defaultSchema', JSON.stringify(schema));
             return schema as AppSchema;
         };
     })();
diff --git a/package.json b/package.json
index 6983f320..654c1b22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vstconsulting/vstutils",
-  "version": "5.10.0b7",
+  "version": "5.10.0b9",
   "type": "module",
   "author": "VST Consulting",
   "license": "Apache-2.0",
diff --git a/pyproject.toml b/pyproject.toml
index e132716e..49ebc869 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -91,6 +91,7 @@ omit = [
     'upload_big.py',
     '*/vstutils/__main__.py',
     '*/vstutils/asgi_worker.py',
+    '*/vstutils/admin_urls.py',
     '*/vstutils/celery_beat_scheduler.py',
     '*/vstutils/wsgi.py',
     '*/vstutils/compile.py',
@@ -109,6 +110,7 @@ exclude_lines = [
     'noce',
     'raise NotImplementedError',
     'if _t.TYPE_CHECKING:',
+    'if typing.TYPE_CHECKING:',
 ]
 
 [tool.bandit]
@@ -145,6 +147,7 @@ django_settings_module = "vstutils.settings"
 [[tool.mypy.overrides]]
 module = [
     "django_celery_beat.*",
+    "drf_orjson_renderer.*",
     "ldap.*",
     "uwsgi.*",
     "jsmin.*",
diff --git a/setup.py b/setup.py
index fc90125f..20791b02 100644
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@
         'vstutils/static/bundle/.*\.js$'
     ],
     install_requires=[
-        "django~=" + (os.environ.get('DJANGO_DEP', "") or "5.0.3"),
+        "django~=" + (os.environ.get('DJANGO_DEP', "") or "5.0.6"),
     ]
     + requirements,
     extras_require={
diff --git a/test_src/test_proj/settings.py b/test_src/test_proj/settings.py
index 8fcf195e..8f71331d 100644
--- a/test_src/test_proj/settings.py
+++ b/test_src/test_proj/settings.py
@@ -9,6 +9,10 @@
 
 MIDDLEWARE.append('vstutils.middleware.TimezoneHeadersMiddleware')
 MIDDLEWARE.insert(0, 'django.middleware.gzip.GZipMiddleware')
+MIDDLEWARE.insert(5, 'django.middleware.security.SecurityMiddleware')
+MIDDLEWARE.insert(6, 'django.contrib.sessions.middleware.SessionMiddleware')
+MIDDLEWARE.insert(8, 'django.contrib.auth.middleware.AuthenticationMiddleware')
+MIDDLEWARE.insert(9, 'django.contrib.messages.middleware.MessageMiddleware')
 
 HEALTH_BACKEND_CLASS = 'test_proj.health.TestDefaultBackend'
 
@@ -135,13 +139,19 @@
     model='test_proj.models.ModelWithChangedFk'
 )
 
-GUI_VIEWS[r'^gui/$'] = ''
+GUI_VIEWS[r'^gui/$'] = r'^csrf_disable_gui/$'
 GUI_VIEWS[r'^csrf_disable_gui/$'] = {
-    'BACKEND': 'vstutils.gui.views.GUIView',
+    'BACKEND': 'vstutils.gui.views.SWView',
     'CSRF_ENABLE': False
 }
+GUI_VIEWS['login'] = {
+    'BACKEND': 'django.contrib.auth.views.LoginView',
+    'OPTIONS': {
+        'name': 'login'
+    }
+}
 GUI_VIEWS[r'^suburls/'] = {
-    'BACKEND': 'test_proj.suburls.urlpatterns'
+    'BACKEND': 'test_proj.suburls.urlpatterns',
 }
 GUI_VIEWS[r'^suburls_namespaced/'] = {
     'BACKEND': 'test_proj.suburls.urlpatterns',
diff --git a/test_src/test_proj/suburls.py b/test_src/test_proj/suburls.py
index 4073b728..d31e437e 100644
--- a/test_src/test_proj/suburls.py
+++ b/test_src/test_proj/suburls.py
@@ -1,9 +1,22 @@
-from django.urls.conf import re_path
-from django.contrib import admin
+from django.urls.conf import path
+from django.contrib.auth import views as auth
+from vstutils.gui.views import BaseView
 
 app_name = 'suburls_app'
 
+
+class SubURLView(BaseView):
+    login_required = True
+    template_name = 'test_view_template.html'
+
+
+class SubURLView2(BaseView):
+    login_required = False
+    template_name = 'test_view_template.html'
+
+
 urlpatterns = [
-    re_path(r'^admin/', admin.site.urls),
-    re_path(r'^', admin.site.urls),
+    path('', SubURLView.as_view()),
+    path('test/', SubURLView2.as_view()),
+    path('login/', auth.LoginView.as_view(), name='login'),
 ]
diff --git a/test_src/test_proj/templates/test_view_template.html b/test_src/test_proj/templates/test_view_template.html
new file mode 100644
index 00000000..5e17506e
--- /dev/null
+++ b/test_src/test_proj/templates/test_view_template.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<html lang="{% block html_language %}{{ request.language.code }}{% endblock %}">
+</html>
\ No newline at end of file
diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index acd82f63..f2d19b4f 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -734,7 +734,7 @@ class ViewsTestCase(BaseTestCase):
 
     def test_main_views(self):
         # Main
-        self.get_result('get', '/')
+        self.get_result('get', '/suburls/test/')
         # API
         api = self.get_result('get', '/api/')
         print(api)
@@ -778,6 +778,22 @@ def test_main_views(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(json.loads(response.content), {'status': "ok"})
 
+        response = fclient.get('/manifest.json')
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(
+            response.json(),
+            {
+                'background_color': 'rgb(236,240,245)',
+                'display': 'fullscreen',
+                'icons': [],
+                'name': 'Example project',
+                'scope': '.',
+                'short_name': 'Test_proj',
+                'start_url': './',
+                'theme_color': 'rgb(236,240,245)',
+            }
+        )
+
         # 404
         self.get_result('get', '/api/v1/some/', code=404)
         self.get_result('get', '/other_invalid_url/', code=404)
@@ -2529,7 +2545,10 @@ def test_simple_queries(self):
         response = self.get_result('put', '/api/endpoint/', 200, data=json.dumps(request))
 
         self.assertEqual(response[0]['status'], 404, response[0])
-        self.assertTrue('Page not found' in response[0]['data']['detail'])
+        self.assertTrue(
+            'The requested resource was not found on this server.' in response[0]['data']['detail'],
+            response[0]['data']
+        )
 
     def test_testing_tool(self):
         with self.assertRaises(AssertionError):
@@ -3278,23 +3297,23 @@ def test_user_language_detection(self):
         )
 
         for expected_code, header in languages:
-            response = self.client_class().get('/', HTTP_ACCEPT_LANGUAGE=header)
+            response = self.client_class().get('/suburls/test/', HTTP_ACCEPT_LANGUAGE=header)
             self.assertEqual(response.status_code, 200)
             self.assertEqual(response.cookies['lang'].value, expected_code)
             self.assertEqual(to_soup(response.content).html['lang'], expected_code, f'Header: {header}')
 
-        response = client.get('/?lang=ru', HTTP_ACCEPT_LANGUAGE='de,es;q=0.9')
+        response = client.get('/suburls/test/?lang=ru', HTTP_ACCEPT_LANGUAGE='de,es;q=0.9')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.cookies.get('lang').value, 'ru')
         self.assertEqual(to_soup(response.content).html['lang'], 'ru')
 
-        response = client.get('/', HTTP_ACCEPT_LANGUAGE='de,es;q=0.9')
+        response = client.get('/suburls/test/', HTTP_ACCEPT_LANGUAGE='de,es;q=0.9')
         self.assertEqual(to_soup(response.content).html['lang'], 'ru')
 
-        response = self.client_class().get('/')
+        response = self.client_class().get('/suburls/test/')
         self.assertEqual(to_soup(response.content).html['lang'], 'en')
 
-        response = self.client_class().get('/', HTTP_ACCEPT_LANGUAGE='de,es;q=0.9')
+        response = self.client_class().get('/suburls/test/', HTTP_ACCEPT_LANGUAGE='de,es;q=0.9')
         self.assertEqual(to_soup(response.content).html['lang'], 'en')
 
     def test_server_translation(self):
@@ -4063,12 +4082,6 @@ def test_swagger_schema(self):
             'file'
         )
 
-    def test_manifest_json(self):
-        result = self.get_result('get', '/manifest.json')
-        self.assertEqual(result['name'], 'Example project')
-        self.assertEqual(result['short_name'], 'Test_proj')
-        self.assertEqual(result['display'], 'fullscreen')
-
     def test_model_fk_field(self):
         bulk_data = [
             dict(method='post', path='subhosts', data={'name': 'tt_name'}),
@@ -5606,12 +5619,9 @@ def test_external_custom_models(self):
         CachableModel.objects.all().delete()
 
     def test_additional_urls(self):
-        response = self.client.get('/suburls/admin/login/')
-        self.assertEqual(response.status_code, 200)
-        response = self.client.get('/suburls_module/admin/login/')
-        self.assertEqual(response.status_code, 200)
-        response = self.client.get(f'/suburls/login/')
-        self.assertEqual(response.status_code, 200)
+        response = self.client.get('/suburls/')
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.url, '/login?next=/suburls/')
 
 
 class ToolsTestCase(BaseTestCase):
@@ -6635,7 +6645,6 @@ def access_token_tester(self, prepare_data):
         )
         self.assertDictEqual(claims, {
             'jti': claims['jti'],
-            'session_key': claims['session_key'],
             'iss': 'https://test_proj.vst',
             'exp': 1060,
             'client_id': 'test-client',
@@ -6910,7 +6919,6 @@ def test_anon_user_login(self):
         self.assertDictEqual(access_token_jwt, {
             'exp': access_token_jwt['exp'],
             'iat': access_token_jwt['iat'],
-            'session_key': access_token_jwt['session_key'],
             'sub': access_token_jwt['sub'],
             'jti': access_token_jwt['jti'],
             'anon': True,
diff --git a/test_src/test_proj/views.py b/test_src/test_proj/views.py
index 2be3dbea..1fdf14fb 100644
--- a/test_src/test_proj/views.py
+++ b/test_src/test_proj/views.py
@@ -243,6 +243,8 @@ def test_json_serializer(self, request, *_, **__):
     Host,
     view_class=(HostCreateDummyMixin, 'read_only'),
     override_authentication_classes=None,
+    permission_classes=[AllowAny],
+    override_permission_classes=True,
 )
 
 CacheableView = create_view(CachableProxyModel)
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index d2a3b15e..f589830e 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b8'
+__version__: str = '5.10.0b9'
diff --git a/vstutils/admin_urls.py b/vstutils/admin_urls.py
new file mode 100644
index 00000000..fb7c312c
--- /dev/null
+++ b/vstutils/admin_urls.py
@@ -0,0 +1,13 @@
+from django.conf import settings
+from django.urls.conf import path
+from django.contrib import admin
+
+
+admin.site.site_header = 'Admin panel'
+admin.site.site_title = settings.VST_PROJECT
+admin.site.index_title = f"{settings.VST_PROJECT.upper()} Settings Panel"
+admin.site.site_url = "/"
+
+urlpatterns = [
+    path("admin/", admin.site.urls),
+]
diff --git a/vstutils/api/renderers.py b/vstutils/api/renderers.py
index 989a6736..38914e6e 100644
--- a/vstutils/api/renderers.py
+++ b/vstutils/api/renderers.py
@@ -5,7 +5,7 @@
 from django.utils.functional import Promise, LazyObject
 from rest_framework.renderers import BaseRenderer
 from rest_framework.settings import api_settings
-from drf_orjson_renderer.renderers import ORJSONRenderer as BaseORJSONRenderer  # type: ignore
+from drf_orjson_renderer.renderers import ORJSONRenderer as BaseORJSONRenderer
 
 from ..utils import get_if_lazy
 
diff --git a/vstutils/asgi.py b/vstutils/asgi.py
index 34c4578b..9803e30a 100644
--- a/vstutils/asgi.py
+++ b/vstutils/asgi.py
@@ -11,6 +11,8 @@
 from django.apps import apps
 from django.core.handlers.asgi import ASGIHandler
 from django.contrib.staticfiles import finders
+from django.test import override_settings
+from django.utils.module_loading import import_string
 from fastapi import FastAPI, Request
 from fastapi.responses import PlainTextResponse, FileResponse, ORJSONResponse
 from fastapi.middleware.gzip import GZipMiddleware
@@ -20,6 +22,10 @@
 
 from .signals import before_mount_app
 
+if typing.TYPE_CHECKING:
+    class ManifestProtocol(typing.Protocol):
+        data: dict[str, typing.Any]
+
 
 SPA_STATIC_MAX_AGE = round(
     timedelta(days=30).total_seconds()
@@ -98,6 +104,13 @@ async def well_known(file_path: str, request: Request):
     async def api_live_check():
         return ORJSONResponse({"status": "ok"})
 
+if settings.ENABLE_BACKEND_MANIFEST and not any(m.path == '/manifest.json' for m in application.routes):
+    manifest: 'ManifestProtocol' = import_string(settings.MANIFEST_CLASS)()
+
+    @application.get('/manifest.json')
+    async def gui_manifest():
+        return ORJSONResponse(manifest.data)
+
 
 @application.middleware('http')
 async def add_server_timing_header(request: Request, call_next):
@@ -118,5 +131,26 @@ async def serve_spa(file_path: str, request: Request):
             response.headers['Cache-Control'] = f'public, max-age {SPA_STATIC_MAX_AGE}'
         return response
 
+if settings.ENABLE_ADMIN_PANEL:
+    class ASGIRequest(ASGIHandler.request_class):
+        def __init__(self, scope, body_file):  # nocv
+            scope['root_path'] = ""
+            super().__init__(scope, body_file)
+
+        @functools.cached_property
+        def urlconf(self):  # nocv
+            # pylint: disable=import-outside-toplevel
+            from . import admin_urls
+            return admin_urls
+
+    class AdminASGIHandler(ASGIHandler):
+        request_class = ASGIRequest
+
+    with override_settings(MIDDLEWARE=settings.ADMIN_MIDDLEWARE):
+        django_admin_app = AdminASGIHandler()
+
+    admin_application = FastAPI(openapi_url=None, docs_url=None, redoc_url=None, root_path='/admin')
+    admin_application.mount("/", django_admin_app)
+    application.mount("/admin/", admin_application)
 
 application.mount("/", ASGIHandler())
diff --git a/vstutils/gui/pwa_manifest.py b/vstutils/gui/pwa_manifest.py
index 35aa0fdb..7368f856 100644
--- a/vstutils/gui/pwa_manifest.py
+++ b/vstutils/gui/pwa_manifest.py
@@ -1,6 +1,5 @@
 import typing
 
-import orjson
 from django.conf import settings
 
 
@@ -29,7 +28,3 @@ def icons(self):
     @property
     def data(self) -> typing.Dict:
         return self.manifest_data
-
-    @property
-    def json(self) -> typing.Text:
-        return orjson.dumps(self.data, option=orjson.OPT_INDENT_2).decode('utf-8')
diff --git a/vstutils/gui/views.py b/vstutils/gui/views.py
index 36909c38..02451170 100644
--- a/vstutils/gui/views.py
+++ b/vstutils/gui/views.py
@@ -8,16 +8,12 @@
 from django.views.generic import TemplateView
 from django.template.response import TemplateResponse
 from django.conf import settings
-from django.contrib.auth import get_user_model
 from django.urls import reverse_lazy
 from jsmin import jsmin
 
 from ..utils import lazy_translate as __
 
 
-UserModel = get_user_model()
-
-
 class BaseView(TemplateView):
     login_required = False
     minify_response = True
@@ -34,22 +30,11 @@ def as_view(cls, *args, **kwargs):
         return cls.login_required and login_required(view, login_url=reverse_lazy('login')) or view  # type: ignore
 
 
-class GUIView(BaseView):
-    template_name = "gui/gui.html"
-
-
 class OfflineView(BaseView):
     login_required = False
     template_name = "gui/offline.html"
 
 
-class ManifestView(BaseView):
-    minify_response = False
-    login_required = False
-    template_name = "gui/manifest.json"
-    content_type = 'application/json'
-
-
 class JSMinTemplateResponse(TemplateResponse):
     @property
     def rendered_content(self):
diff --git a/vstutils/oauth2/authentication.py b/vstutils/oauth2/authentication.py
index ab01a50d..e0198beb 100644
--- a/vstutils/oauth2/authentication.py
+++ b/vstutils/oauth2/authentication.py
@@ -51,7 +51,7 @@ def get_session(session_key):
 class JWTBearerTokenAuthentication(BaseAuthentication):
     def authenticate(self, request: "Request"):
         if token := _get_request_token(request):
-            request._request.session = get_session(token['session_key'])  # pylint: disable=protected-access
+            request._request.session = get_session(token['jti'])  # pylint: disable=protected-access
             self.patch_vary(request)
             return get_user(request._request), token  # pylint: disable=protected-access
 
diff --git a/vstutils/oauth2/authorization_server.py b/vstutils/oauth2/authorization_server.py
index 2371c517..e29f6800 100644
--- a/vstutils/oauth2/authorization_server.py
+++ b/vstutils/oauth2/authorization_server.py
@@ -77,19 +77,30 @@ def get_jwks(self):
 
     def get_extra_claims(self, client: SimpleClient, grant_type, user: 'UserWrapper', scope):
         claims = {}
+        session_key: Optional[str] = None
 
-        client.request.ensure_session()
-        django_request = client.request._request  # pylint: disable=protected-access
-        if not user.is_anon():
-            login(django_request, user.django_user)
-            django_request.session.save()
-        claims['session_key'] = django_request.session.session_key
+        if grant_type != 'refresh_token':
+            django_request = client.request._request  # pylint: disable=protected-access
+
+            if user.is_anon():
+                client.request.ensure_session()
+                session_key = django_request.session.session_key
+            else:
+                client.request.ensure_session()
+                login(django_request, user.django_user)
+                django_request.session.save()
+                session_key = django_request.session.session_key
+
+        elif grant_type == 'refresh_token':
+            session_key = client.request.refresh_token.claims['jti']
+
+        claims['jti'] = session_key
 
         if user.is_anon():
             claims['anon'] = True
 
         if extra_claims_provider:
-            if (extra_claims := extra_claims_provider(user.django_user)):
+            if extra_claims := extra_claims_provider(user.django_user):
                 claims.update(extra_claims)
 
         return claims
diff --git a/vstutils/oauth2/endpoints.py b/vstutils/oauth2/endpoints.py
index 7b131b1c..7ac57300 100644
--- a/vstutils/oauth2/endpoints.py
+++ b/vstutils/oauth2/endpoints.py
@@ -6,10 +6,11 @@
 from drf_yasg import openapi
 from drf_yasg.utils import swagger_auto_schema
 from fastapi import Request
-from rest_framework.parsers import FormParser, JSONParser
+from rest_framework.parsers import FormParser
 from rest_framework.permissions import IsAuthenticated, BasePermission
 from rest_framework.throttling import AnonRateThrottle
 from rest_framework.views import APIView
+from drf_orjson_renderer.parsers import ORJSONParser as JSONParser
 from vstutils.api.permissions import IsOpenApiRequest
 from vstutils.api.responses import HTTP_200_OK
 
@@ -29,8 +30,8 @@ class Oauth2Throttle(AnonRateThrottle):
 class TokenViewSet(APIView):
     parser_classes = [JSONParser, FormParser]
     throttle_classes = [Oauth2Throttle]
-    authentication_classes = []
-    permission_classes = []
+    authentication_classes = set()
+    permission_classes = set()
 
     @swagger_auto_schema(
         operation_id="get_token",
diff --git a/vstutils/settings.py b/vstutils/settings.py
index abcb7b40..ff2e5f1e 100644
--- a/vstutils/settings.py
+++ b/vstutils/settings.py
@@ -751,13 +751,22 @@ def secret_key(secret_file, default='*sg17)9wa_e+4$n%7n7r_(kqwlsc^^xdoc3&px$hs)s
 INSTALLED_APPS += ADDONS
 
 if ENABLE_ADMIN_PANEL:
-    INSTALLED_APPS.append('django.contrib.admin')
+    INSTALLED_APPS.insert(0, 'django.contrib.admin')
 
 
 # Additional middleware and auth
 ##############################################################
 MIDDLEWARE: _t.List[_t.Text] = [
     'vstutils.middleware.ExecuteTimeHeadersMiddleware',
+    'vstutils.middleware.FrontendChangesNotifications',
+    'htmlmin.middleware.HtmlMinifyMiddleware',
+    'htmlmin.middleware.MarkRequestMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'vstutils.middleware.LangMiddleware',
+]
+
+ADMIN_MIDDLEWARE = [
     'vstutils.middleware.FrontendChangesNotifications',
     'htmlmin.middleware.HtmlMinifyMiddleware',
     'htmlmin.middleware.MarkRequestMiddleware',
@@ -1115,6 +1124,8 @@ def parse_db(params):
     ],
     'DEEP_LINKING': True,
     'USE_SESSION_AUTH': False,
+    'REFETCH_SCHEMA_WITH_AUTH': True,
+    'REFETCH_SCHEMA_ON_LOGOUT': True,
     'SECURITY_DEFINITIONS': {},
 }
 
@@ -1257,6 +1268,7 @@ def parse_db(params):
         VST_PROJECT: default_logger_data,
         'vstutils': default_logger_data,
         'drf_yasg.generators': default_logger_data,
+        'authlib': default_logger_data,
     }
 }
 
@@ -1269,6 +1281,9 @@ def parse_db(params):
     "urls.W005",
     "fields.W122",
     "staticfiles.W004",
+    "admin.E408",
+    "admin.E409",
+    "admin.E410",
 ]
 
 
@@ -1322,20 +1337,9 @@ def parse_db(params):
 # View settings
 ##############################################################
 MANIFEST_CLASS = 'vstutils.gui.pwa_manifest.PWAManifest'
+ENABLE_BACKEND_MANIFEST = True
 
 VIEWS: SIMPLE_OBJECT_SETTINGS_TYPE = {
-    "GUI": {
-        "BACKEND": 'vstutils.gui.views.GUIView',
-        "OPTIONS": {
-            'name': 'gui'
-        }
-    },
-    "MANIFEST": {
-        "BACKEND": 'vstutils.gui.views.ManifestView',
-        "OPTIONS": {
-            'name': 'pwa_manifest'
-        }
-    },
     "SERVICE_WORKER": {
         "BACKEND": 'vstutils.gui.views.SWView',
         "OPTIONS": {
@@ -1363,8 +1367,6 @@ def parse_db(params):
 }
 
 GUI_VIEWS: _t.Dict[_t.Text, _t.Union[_t.Text, _t.Dict]] = {
-    r'': 'GUI',
-    'manifest.json': 'MANIFEST',
     'service-worker.js': 'SERVICE_WORKER',
     'offline.html': 'OFFLINE',
 }
diff --git a/vstutils/templates/400.html b/vstutils/templates/400.html
deleted file mode 100644
index 5f074253..00000000
--- a/vstutils/templates/400.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "base_error.html" %}
-
-{% block pwa_block %}{% endblock %}
-
-{% block status_code %}400{% endblock %}
-{% block error_text %}{% translate_text "Bad request" %}{% endblock %}
-
-{% block alter_auth %}
-    {% include "go_back_button.html" %}
-{% endblock %}
-
diff --git a/vstutils/templates/403.html b/vstutils/templates/403.html
deleted file mode 100644
index 3b11d552..00000000
--- a/vstutils/templates/403.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "base_error.html" %}
-
-{% block status_code %}403{% endblock %}
-{% block error_text %}{% translate_text "Permission denied" %}{% endblock %}
-
-{% block alter_auth %}
-    {% include "go_back_button.html" %}
-{% endblock %}
diff --git a/vstutils/templates/404.html b/vstutils/templates/404.html
deleted file mode 100644
index 8ed62566..00000000
--- a/vstutils/templates/404.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "base_error.html" %}
-
-{% block status_code %}404{% endblock %}
-{% block error_text %}{% translate_text "Page not found" %}{% endblock %}
-
-{% block alter_auth %}
-    {% include "go_back_button.html" %}
-{% endblock %}
diff --git a/vstutils/templates/500.html b/vstutils/templates/500.html
deleted file mode 100644
index 8d5a3f48..00000000
--- a/vstutils/templates/500.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "base_error.html" %}
-
-{% block pwa_block %}{% endblock %}
-
-{% block status_code %}500{% endblock %}
-{% block error_text %}{% translate_text "Server error" %}{% endblock %}
diff --git a/vstutils/templates/auth/language_selector.html b/vstutils/templates/auth/language_selector.html
deleted file mode 100644
index d5fed980..00000000
--- a/vstutils/templates/auth/language_selector.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% if languages|length > 1 %}
-    <form id="lang-form" action="" method="get" style="width: 120px; top: 10px; right: 10px; position: absolute;">
-        <select class="custom-select" name="lang">
-            {% for code, name in languages %}
-                <option {% if request.language.code == code %}selected{% endif %} value="{{ code }}">{{ name }}</option>
-            {% endfor %}
-        </select>
-    </form>
-    <script>
-        window.addEventListener('load', function() {
-            const selector = document.getElementsByName('lang')[0];
-            selector.addEventListener('change', function() {
-                document.getElementById('lang-form').submit();
-            });
-        });
-    </script>
-{% endif %}
\ No newline at end of file
diff --git a/vstutils/templates/base.html b/vstutils/templates/base.html
old mode 100755
new mode 100644
index 8a4dc697..58e8b551
--- a/vstutils/templates/base.html
+++ b/vstutils/templates/base.html
@@ -18,72 +18,29 @@
     {% block flavicon %}
         <link rel="shortcut icon" href="{% static_path '/img/logo/favicon.ico' %}">
     {% endblock %}
-
-    {% block gui_init_scripts %}
-        <script defer src="{% static_path 'bundle/base.js' %}?v={{ vstutils_version }}"></script>
-    {% endblock %}
-
-    {% block style %}
-
-            {% block gui_init_inline_styles %}
-            {% endblock %}
-
-            {% block bootstrap_theme %}
-            {% endblock %}
-
-
-            {% block custom_style %}
-            {% endblock %}
-
-    {% endblock %}
-    {% block resource_list %}
-    {% endblock %}
-
-    {% block common_script %}
-    {% endblock %}
-
     {% block pwa_block %}
-        <!-- PWA Manifest -->
-        <link rel="manifest" href="/manifest.json">
-        <!-- Theme color for PWA -->
-        <meta name="theme-color" content="{{ manifest_object.data.theme_color }}">
-
-       {% block pwa_icons %}
-            <!-- Icons for PWA -->
-            {% cache block_timeout pwa_icons_block gui_named_version %}
-            {% for icon in manifest_object.icons %}
-                <link rel="icon" type="{{ icon.type }}" sizes="{{ icon.sizes }}" href="{{ icon.src }}">
-                <link rel="apple-touch-icon" type="{{ icon.type }}" sizes="{{ icon.sizes }}" href="{{ icon.src }}">
-            {% endfor %}
-            {% endcache %}
-        {% endblock %}
+            <!-- PWA Manifest -->
+            <link rel="manifest" href="/manifest.json">
+            <!-- Theme color for PWA -->
+            <meta name="theme-color" content="{{ manifest_object.data.theme_color }}">
+
+           {% block pwa_icons %}
+                <!-- Icons for PWA -->
+                {% cache block_timeout pwa_icons_block gui_named_version %}
+                {% for icon in manifest_object.icons %}
+                    <link rel="icon" type="{{ icon.type }}" sizes="{{ icon.sizes }}" href="{{ icon.src }}">
+                    <link rel="apple-touch-icon" type="{{ icon.type }}" sizes="{{ icon.sizes }}" href="{{ icon.src }}">
+                {% endfor %}
+                {% endcache %}
+            {% endblock %}
     {% endblock %}
 </head>
 {% endblock %}
 
 {% block body %}
-    <body class="{% block bodyclass %}hold-transition login-page{% endblock %}">
-        <div class="login-box">
-            {% include "auth/language_selector.html" %}
-
-            {% block login_logo %}
-                <div class="login-logo">
-                    <a>{{ project_gui_name }}</a>
-                </div>
-            {% endblock %}
-
-            {% block login_body %}
-                <div class="login-box-body rounded">
-                    {% block login_body_content %}{% endblock %}
-                </div>
-                {% block alter_auth %}{% endblock %}
-            {% endblock %}
-          <!-- /.login-box-body -->
-        </div>
-        <!-- /.login-box -->
-
-        {% block script %}
-        {% endblock %}
+    <body>
+    {% block body_content %}
+    {% endblock %}
     </body>
 {% endblock %}
 </html>
diff --git a/vstutils/templates/base_error.html b/vstutils/templates/base_error.html
deleted file mode 100644
index a603d016..00000000
--- a/vstutils/templates/base_error.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "base.html" %}
-
-{% block login_body_content %}
-    <p style="text-align: center; font-size: 1.5rem;">
-        {% translate_text "Error" %} {% block status_code %}{% endblock %}
-    </p>
-    <p style="text-align: center; margin: 0;">
-        {% block error_text %}{% endblock %}
-    </p>
-{% endblock %}
diff --git a/vstutils/templates/go_back_button.html b/vstutils/templates/go_back_button.html
deleted file mode 100644
index 991c1f85..00000000
--- a/vstutils/templates/go_back_button.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<script>
-    if (window.history.length > 1) {
-        const btn = document.createElement('btn');
-        btn.className = 'btn btn-default';
-        btn.textContent = '{% translate_text "Go back" %}';
-        btn.style.display = 'block';
-        btn.style.margin = '0.9rem 0';
-        btn.addEventListener('click', () => window.history.back());
-        document.currentScript.insertAdjacentElement('beforebegin', btn);
-    }
-</script>
diff --git a/vstutils/templates/gui/base.html b/vstutils/templates/gui/base.html
deleted file mode 100644
index 95a91198..00000000
--- a/vstutils/templates/gui/base.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "base.html" %}
-{% load request_static %}
-{% load cache %}
-
-{% block body %}
-    <body class="sidebar-mini {% block bodyclass %}{% endblock %}">
-        <div id="RealBody"></div>
-
-        {% block script %}{% endblock %}
-    </body>
-{% endblock %}
\ No newline at end of file
diff --git a/vstutils/templates/gui/gui.html b/vstutils/templates/gui/gui.html
deleted file mode 100755
index 5ce5ae0e..00000000
--- a/vstutils/templates/gui/gui.html
+++ /dev/null
@@ -1 +0,0 @@
-{% extends "gui/base.html" %}
\ No newline at end of file
diff --git a/vstutils/templates/registration/base_agreements.html b/vstutils/templates/registration/base_agreements.html
index 6a065dfd..f3326b94 100644
--- a/vstutils/templates/registration/base_agreements.html
+++ b/vstutils/templates/registration/base_agreements.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block login_body_content %}
+{% block body_content %}
     <style>
         .login-box {
             width: auto;
@@ -17,5 +17,4 @@ <h3 style="text-align: center">{% translate_text "$header_message" capfirst %}</
             {{ terms | safe }}
         </div>
     {% endblock %}
-
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/vstutils/templates/registration/confirm_email.html b/vstutils/templates/registration/confirm_email.html
index a4fa88df..5560b61e 100644
--- a/vstutils/templates/registration/confirm_email.html
+++ b/vstutils/templates/registration/confirm_email.html
@@ -484,4 +484,4 @@ <h1>{{ title }}</h1>
       </tr>
     </tbody></table>
 
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/vstutils/tests.py b/vstutils/tests.py
index 415cf0d0..ad102640 100644
--- a/vstutils/tests.py
+++ b/vstutils/tests.py
@@ -96,6 +96,7 @@ def _create_user(self, is_super_user=True, **kwargs):
     def _login(self):
         client = self.client
         client.force_login(self.user)
+        # TODO: Make OAuth2 auth
         return client
 
     def _logout(self, client):
diff --git a/vstutils/urls.py b/vstutils/urls.py
index a913ebf4..f5c76770 100644
--- a/vstutils/urls.py
+++ b/vstutils/urls.py
@@ -4,10 +4,8 @@
 
 from django.conf import settings
 from django.urls.conf import include, re_path, path
-from django.contrib import admin
 from django.views.static import serve
 from django.contrib.staticfiles.views import serve as serve_static
-from django.views.generic.base import RedirectView
 from rest_framework import permissions
 
 from .api.routers import MainRouter
@@ -35,10 +33,6 @@
         })
 
 
-class AdminLoginLogoutRedirectView(RedirectView):
-    query_string = True
-
-
 # Main router for all APIs versions
 router = MainRouter(perms=(permissions.IsAuthenticated,))
 router.generate_routers(settings.API)
@@ -46,11 +40,6 @@ class AdminLoginLogoutRedirectView(RedirectView):
 if settings.ENABLE_METRICS_VIEW:
     router.register_view('metrics', MetricsView.as_view({'get': 'list'}), 'metrics')
 
-if settings.ENABLE_ADMIN_PANEL:
-    admin.site.site_header = 'Admin panel'
-    admin.site.site_title = settings.VST_PROJECT
-    admin.site.index_title = f"{settings.VST_PROJECT.upper()} Settings Panel"
-    admin.site.site_url = "/"
 doc_url = getattr(settings, 'DOC_URL', '/docs/')[1:]
 
 urlpatterns = list(URLHandlers()) if gui_enabled else []
@@ -60,10 +49,6 @@ class AdminLoginLogoutRedirectView(RedirectView):
         path(settings.ACCOUNT_URL, include(list(URLHandlers('ACCOUNT_URLS'))))
     ]
 
-urlpatterns += [
-    path('admin/', admin.site.urls),
-] if getattr(settings, 'ENABLE_ADMIN_PANEL', False) else []
-
 urlpatterns += [re_path(rf'^{settings.API_URL}/', include(router.urls))]
 if settings.STATIC_URL.startswith('/'):
     urlpatterns.append(
diff --git a/yarn.lock b/yarn.lock
index 76672414..72ba59d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -813,10 +813,10 @@
   resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.3.tgz#5b2fb4d8cd44c05deef8a7b0e6deb9ccb8939d18"
   integrity sha512-/BypzV0H1y1HzgYpxqRaXGBRqfodgoBBCcsrujT6QRcakDQdfU+Lq9PENPh5jB4I44YWq+0C2eHsHya+nZY1sA==
 
-"@rushstack/eslint-patch@^1.10.2":
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.10.2.tgz#053f1540703faa81dea2966b768ee5581c66aeda"
-  integrity sha512-hw437iINopmQuxWPSUEvqE56NCPsiU8N4AYtfHmJFckclktzK9YQJieD3XkDCDH4OjL+C7zgPUh73R/nrcHrqw==
+"@rushstack/eslint-patch@^1.10.3":
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.10.3.tgz#391d528054f758f81e53210f1a1eebcf1a8b1d20"
+  integrity sha512-qC/xYId4NMebE6w/V33Fh9gWxLgURiNYgVNObbJl2LZv0GUUItCcCqC5axQSwRaAgaxl2mELq1rMzlswaQ0Zxg==
 
 "@rushstack/node-core-library@4.0.2":
   version "4.0.2"
@@ -992,10 +992,10 @@
   resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.4.tgz#cd6531924f60834fa4a1b8081f9eecf9bb1117f0"
   integrity sha512-jA2llq2zNkg8HrALI7DtWzhALcVH0l7i89yhY3iBdOz6cBPeACoFq+fkQrjHA39t1hnSFOboZ7A/AY5MMZSlag==
 
-"@types/swagger-schema-official@^2.0.22":
-  version "2.0.23"
-  resolved "https://registry.yarnpkg.com/@types/swagger-schema-official/-/swagger-schema-official-2.0.23.tgz#c03bb5a0c3fe652f2f560026aacc4867d21143c1"
-  integrity sha512-9b+/Lh14ROankvt9sWprogb1vK6mn7pXzAhHiEG76I5O3RXJhtdv0IQSGvL5Huezj68IEH8KVPkNZzlNdanTYw==
+"@types/swagger-schema-official@^2.0.25":
+  version "2.0.25"
+  resolved "https://registry.yarnpkg.com/@types/swagger-schema-official/-/swagger-schema-official-2.0.25.tgz#c8073914004d0a9c5412aeaf458d96e34c504840"
+  integrity sha512-T92Xav+Gf/Ik1uPW581nA+JftmjWPgskw/WBf4TJzxRG/SJ+DfNnNE+WuZ4mrXuzflQMqMkm1LSYjzYW7MB1Cg==
 
 "@types/web-bluetooth@^0.0.20":
   version "0.0.20"
@@ -1098,10 +1098,10 @@
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue2/-/plugin-vue2-2.3.1.tgz#53078d3d9d50d9863f1fbb1c1ef7791a5fcd4948"
   integrity sha512-/ksaaz2SRLN11JQhLdEUhDzOn909WEk99q9t9w+N12GjQCljzv7GyvAbD/p20aBUjHkvpGOoQ+FCOkG+mjDF4A==
 
-"@vitest/coverage-istanbul@^1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@vitest/coverage-istanbul/-/coverage-istanbul-1.5.1.tgz#43aa3058542cb9b6ef38f3c70d99f00e61eb2f7a"
-  integrity sha512-E8H34Ul4djgxyF6yss767qbfqw+4HrXVfUUufolL9MdK6gVH568aWV/VYQCfnh3+AIwZyjZrdZZH9f2L6zYxig==
+"@vitest/coverage-istanbul@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@vitest/coverage-istanbul/-/coverage-istanbul-1.6.0.tgz#4df9310b085416f064f7e057373c546dcf14e41c"
+  integrity sha512-h/BwpXehkkS0qsNCS00QxiupAqVkNi0WT19BR0dQvlge5oHghoSVLx63fABYFoKxVb7Ue7+k6V2KokmQ1zdMpg==
   dependencies:
     debug "^4.3.4"
     istanbul-lib-coverage "^3.2.2"
@@ -1248,7 +1248,7 @@
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.23.tgz#e536a6dfd2f5f950d08c2e8ebcfe7e5329a851a1"
   integrity sha512-wBQ0gvf+SMwsCQOyusNw/GoXPV47WGd1xB5A1Pgzy0sQ3Bi5r5xm3n+92y3gCnB3MWqnRDdvfkRGxhKtbBRNgg==
 
-"@vue/test-utils@^1.3.0":
+"@vue/test-utils@^1.3.6":
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.3.6.tgz#6656bd8fa44dd088b4ad80ff1ee28abe7e5ddf87"
   integrity sha512-udMmmF1ts3zwxUJEIAj5ziioR900reDrt6C9H3XpWPsLBx2lpHKoA4BTdd9HNIYbkGltWw+JjWJ+5O6QBwiyEw==
@@ -1257,27 +1257,27 @@
     lodash "^4.17.15"
     pretty "^2.0.0"
 
-"@vueuse/core@^10.9.0":
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-10.9.0.tgz#7d779a95cf0189de176fee63cee4ba44b3c85d64"
-  integrity sha512-/1vjTol8SXnx6xewDEKfS0Ra//ncg4Hb0DaZiwKf7drgfMsKFExQ+FnnENcN6efPen+1kIzhLQoGSy0eDUVOMg==
+"@vueuse/core@^10.11.0":
+  version "10.11.0"
+  resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-10.11.0.tgz#b042585a8bf98bb29c177b33999bd0e3fcd9e65d"
+  integrity sha512-x3sD4Mkm7PJ+pcq3HX8PLPBadXCAlSDR/waK87dz0gQE+qJnaaFhc/dZVfJz+IUYzTMVGum2QlR7ImiJQN4s6g==
   dependencies:
     "@types/web-bluetooth" "^0.0.20"
-    "@vueuse/metadata" "10.9.0"
-    "@vueuse/shared" "10.9.0"
-    vue-demi ">=0.14.7"
+    "@vueuse/metadata" "10.11.0"
+    "@vueuse/shared" "10.11.0"
+    vue-demi ">=0.14.8"
 
-"@vueuse/metadata@10.9.0":
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-10.9.0.tgz#769a1a9db65daac15cf98084cbf7819ed3758620"
-  integrity sha512-iddNbg3yZM0X7qFY2sAotomgdHK7YJ6sKUvQqbvwnf7TmaVPxS4EJydcNsVejNdS8iWCtDk+fYXr7E32nyTnGA==
+"@vueuse/metadata@10.11.0":
+  version "10.11.0"
+  resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-10.11.0.tgz#27be47cf115ee98e947a1bfcd0b1b5b35d785fb6"
+  integrity sha512-kQX7l6l8dVWNqlqyN3ePW3KmjCQO3ZMgXuBMddIu83CmucrsBfXlH+JoviYyRBws/yLTQO8g3Pbw+bdIoVm4oQ==
 
-"@vueuse/shared@10.9.0":
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-10.9.0.tgz#13af2a348de15d07b7be2fd0c7fc9853a69d8fe0"
-  integrity sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==
+"@vueuse/shared@10.11.0":
+  version "10.11.0"
+  resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-10.11.0.tgz#be09262b2c5857069ed3dadd1680f22c4cb6f984"
+  integrity sha512-fyNoIXEq3PfX1L3NkNhtVQUSRtqYwJtJg+Bp9rIzculIZWHTkKSysujrOk2J+NrRulLTQH9+3gGSfYLWSEWU1A==
   dependencies:
-    vue-demi ">=0.14.7"
+    vue-demi ">=0.14.8"
 
 abbrev@^1.0.0:
   version "1.1.1"
@@ -5463,11 +5463,16 @@ vitest@^1.6.0:
     vite-node "1.6.0"
     why-is-node-running "^2.2.2"
 
-vue-demi@>=0.14.5, vue-demi@>=0.14.7:
+vue-demi@>=0.14.5:
   version "0.14.7"
   resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.7.tgz#8317536b3ef74c5b09f268f7782e70194567d8f2"
   integrity sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==
 
+vue-demi@>=0.14.8:
+  version "0.14.8"
+  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.14.8.tgz#00335e9317b45e4a68d3528aaf58e0cec3d5640a"
+  integrity sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==
+
 vue-eslint-parser@^9.3.1, vue-eslint-parser@^9.4.2:
   version "9.4.2"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.4.2.tgz#02ffcce82042b082292f2d1672514615f0d95b6d"

From d9fe73b88db078308a3ad50014b5c94d73e17ca0 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Tue, 18 Jun 2024 15:06:51 -0700
Subject: [PATCH 22/46] Release 5.10.0b10

### Changelog:
* Fix(backend): Runtime errors from starlette.
* Fix(package): Revert unicorn to 0.27.1.
---
 requirements.txt        |  2 +-
 vstutils/__init__.py    |  2 +-
 vstutils/api/routers.py |  3 ++-
 vstutils/asgi.py        | 10 ++++++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index aed71338..4a50a9e7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ ormsgpack~=1.5.0
 pyyaml~=6.0.1
 
 # web server
-uvicorn~=0.30.1
+uvicorn~=0.27.1
 pyuwsgi==2.0.23.post0
 # Restore it if some problems with pyuwsgi
 # uwsgi==2.0.23
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index f589830e..f09df675 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b9'
+__version__: str = '5.10.0b10'
diff --git a/vstutils/api/routers.py b/vstutils/api/routers.py
index 70c15ea8..c2d0c989 100644
--- a/vstutils/api/routers.py
+++ b/vstutils/api/routers.py
@@ -16,7 +16,6 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def get_method_map(self, viewset, method_map):
-        # TODO: Remove it after 3.15 release with https://github.com/encode/django-rest-framework/pull/9057
         bound_methods = {}
         for method, action in method_map.items():
             if getattr(viewset, action, None) is not None:
@@ -90,11 +89,13 @@ def generate(self, views_list):
                 view = import_string(options['view'])
             elif 'model' in options:
                 view = import_string(options['model']).generated_view
+
             args = [prefix, view]
             if 'name' in options:
                 args.append(options['name'])
             elif getattr(view, 'base_name', None) is None:
                 args.append(prefix)
+
             view_type = options.get('type', 'viewset')
             if view_type == 'viewset':
                 self.register(*args)
diff --git a/vstutils/asgi.py b/vstutils/asgi.py
index 9803e30a..6692861d 100644
--- a/vstutils/asgi.py
+++ b/vstutils/asgi.py
@@ -14,7 +14,7 @@
 from django.test import override_settings
 from django.utils.module_loading import import_string
 from fastapi import FastAPI, Request
-from fastapi.responses import PlainTextResponse, FileResponse, ORJSONResponse
+from fastapi.responses import PlainTextResponse, FileResponse, ORJSONResponse, Response
 from fastapi.middleware.gzip import GZipMiddleware
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
@@ -115,7 +115,13 @@ async def gui_manifest():
 @application.middleware('http')
 async def add_server_timing_header(request: Request, call_next):
     start_time = time.monotonic()
-    response = await call_next(request)
+    try:
+        response = await call_next(request)
+    except RuntimeError as err:  # nocv
+        if str(err) == 'No response returned.' and await request.is_disconnected():
+            response = Response(status_code=204)
+        else:
+            raise
     response.headers['Server-Timing'] = f'total_full;dur={round((time.monotonic()-start_time)*1000, 2)}'
     return response
 

From d699c53d58ce1605bf1808d2d7eccd271ec1d782 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Tue, 18 Jun 2024 18:15:40 -0700
Subject: [PATCH 23/46] Release 5.10.0b11

### Changelog:
* Fix(package): Revert django-filters to 23.5.
---
 requirements.txt     | 2 +-
 vstutils/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4a50a9e7..ec96a332 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ django-environ~=0.11.2
 # REST API packages
 djangorestframework~=3.15.1
 drf-yasg==1.21.7
-django-filter==24.2
+django-filter==23.5
 drf_orjson_renderer==1.7.1
 ormsgpack~=1.5.0
 pyyaml~=6.0.1
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index f09df675..3443304d 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b10'
+__version__: str = '5.10.0b11'

From 7750bc8864822c6679583bca1918623d6ff84b6b Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Tue, 18 Jun 2024 19:08:20 -0700
Subject: [PATCH 24/46] Release 5.10.0b12

### Changelog:
* Fix(backend): Add filter class for MtM same as Fk.
* Fix(package): Restore downgraded packages.
---
 requirements.txt        | 4 ++--
 vstutils/__init__.py    | 2 +-
 vstutils/models/base.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index ec96a332..aed71338 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,13 +6,13 @@ django-environ~=0.11.2
 # REST API packages
 djangorestframework~=3.15.1
 drf-yasg==1.21.7
-django-filter==23.5
+django-filter==24.2
 drf_orjson_renderer==1.7.1
 ormsgpack~=1.5.0
 pyyaml~=6.0.1
 
 # web server
-uvicorn~=0.27.1
+uvicorn~=0.30.1
 pyuwsgi==2.0.23.post0
 # Restore it if some problems with pyuwsgi
 # uwsgi==2.0.23
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 3443304d..371e6a98 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b11'
+__version__: str = '5.10.0b12'
diff --git a/vstutils/models/base.py b/vstutils/models/base.py
index 2a194989..9e8adefe 100644
--- a/vstutils/models/base.py
+++ b/vstutils/models/base.py
@@ -506,7 +506,7 @@ def iteration_filter_handler(field_object):
 
             serializer = serializers['serializer_class']()
             for field_name, field in cls.get_model_fields_mapping(iteration_filter_handler).items():
-                if isinstance(field, ForeignKey):
+                if isinstance(field, (ForeignKey, ManyToManyField)):
                     related_name = get_first_match_name([
                         f.name
                         for f in field.related_model._meta.fields

From f734becee3561d9f20dfcae7b425b07be7f76a92 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Thu, 20 Jun 2024 23:31:21 -0700
Subject: [PATCH 25/46] Release 5.10.0b13

### Changelog:
* Fix(backend): Support SQS fifo queues.
* Fix(backend): Setup default favicon.
* Fix(backend): Cache manifest with etag header.
* Chore(backend): Update drf package to 3.15.2.
---
 requirements.txt                           |   2 +-
 test_src/test_proj/test_settings.ini       |   3 +++
 test_src/test_proj/tests.py                |  10 ++++++++++
 vstutils/__init__.py                       |   2 +-
 vstutils/asgi.py                           |  22 +++++++++++++++++----
 vstutils/settings.py                       |   6 ++++++
 vstutils/static/{img/logo => }/favicon.ico | Bin
 7 files changed, 39 insertions(+), 6 deletions(-)
 rename vstutils/static/{img/logo => }/favicon.ico (100%)

diff --git a/requirements.txt b/requirements.txt
index aed71338..db9d302c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ Markdown~=3.6
 django-environ~=0.11.2
 
 # REST API packages
-djangorestframework~=3.15.1
+djangorestframework~=3.15.2
 drf-yasg==1.21.7
 django-filter==24.2
 drf_orjson_renderer==1.7.1
diff --git a/test_src/test_proj/test_settings.ini b/test_src/test_proj/test_settings.ini
index d51f6cdf..1d62ecdc 100644
--- a/test_src/test_proj/test_settings.ini
+++ b/test_src/test_proj/test_settings.ini
@@ -85,6 +85,9 @@ ketama = true
 [rpc.broker_transport_options]
 polling_interval = 0.1
 
+[rpc.broker_transport_options.predefined_queues.test_fifo]
+url = https://ap-southeast-2.queue.amazonaws.com/123456/test.fifo
+
 [worker]
 logfile = /var/log/test_proj2/{__section}.log
 
diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index f2d19b4f..0cb4123d 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -794,6 +794,12 @@ def test_main_views(self):
             }
         )
 
+        response = fclient.get('/manifest.json', headers={'if-none-match': response.headers['etag']})
+        self.assertEqual(response.status_code, 304)
+
+        response = fclient.get('/favicon.ico')
+        self.assertEqual(response.status_code, 200)
+
         # 404
         self.get_result('get', '/api/v1/some/', code=404)
         self.get_result('get', '/other_invalid_url/', code=404)
@@ -5748,6 +5754,10 @@ def test_file_reader(self):
         self.assertEqual(settings.CELERY_RESULT_EXPIRES, 86400)
         self.assertEqual(settings.CREATE_INSTANCE_ATTEMPTS, 10)
         self.assertEqual(settings.CONCURRENCY, 4)
+        self.assertEqual(
+            settings.CELERY_BROKER_TRANSPORT_OPTIONS['predefined_queues']['test.fifo']['url'],
+            'https://ap-southeast-2.queue.amazonaws.com/123456/test.fifo'
+        )
 
         worker_options = {
             'app': 'test_proj.wapp:app',
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 371e6a98..be14eb09 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b12'
+__version__: str = '5.10.0b13'
diff --git a/vstutils/asgi.py b/vstutils/asgi.py
index 6692861d..124ca532 100644
--- a/vstutils/asgi.py
+++ b/vstutils/asgi.py
@@ -2,6 +2,7 @@
 import os
 import posixpath
 import functools
+import hashlib
 import time
 from datetime import timedelta
 
@@ -21,12 +22,12 @@
 from starlette.staticfiles import NotModifiedResponse
 
 from .signals import before_mount_app
+from .api.base import check_request_etag
 
 if typing.TYPE_CHECKING:
     class ManifestProtocol(typing.Protocol):
         data: dict[str, typing.Any]
 
-
 SPA_STATIC_MAX_AGE = round(
     timedelta(days=30).total_seconds()
 )
@@ -88,6 +89,7 @@ async def static(file_path: str, request: Request = None):
 
 if settings.OAUTH_SERVER_ENABLE:
     from vstutils.oauth2.endpoints import oauth_authorization_server, openid_configuration
+
     application.get('/.well-known/oauth-authorization-server')(oauth_authorization_server)
     application.get('/.well-known/openid-configuration')(openid_configuration)
 
@@ -108,8 +110,19 @@ async def api_live_check():
     manifest: 'ManifestProtocol' = import_string(settings.MANIFEST_CLASS)()
 
     @application.get('/manifest.json')
-    async def gui_manifest():
-        return ORJSONResponse(manifest.data)
+    async def gui_manifest(request: Request):
+        etag, is_valid = check_request_etag(
+            request,
+            hashlib.blake2s(settings.FULL_VERSION.encode(), digest_size=6).hexdigest()
+        )
+        if is_valid:
+            return Response(status_code=304, headers={'ETag': etag})
+        return ORJSONResponse(manifest.data, headers={'ETag': etag})
+
+
+@application.get("/favicon.ico")
+async def favicon(request: Request):
+    return await static('favicon.ico', request)
 
 
 @application.middleware('http')
@@ -122,9 +135,10 @@ async def add_server_timing_header(request: Request, call_next):
             response = Response(status_code=204)
         else:
             raise
-    response.headers['Server-Timing'] = f'total_full;dur={round((time.monotonic()-start_time)*1000, 2)}'
+    response.headers['Server-Timing'] = f'total_full;dur={round((time.monotonic() - start_time) * 1000, 2)}'
     return response
 
+
 if not settings.API_ONLY:
     @application.route("/")
     async def root(request: Request):
diff --git a/vstutils/settings.py b/vstutils/settings.py
index ff2e5f1e..0e2bfe32 100644
--- a/vstutils/settings.py
+++ b/vstutils/settings.py
@@ -369,6 +369,11 @@ class RPCBrokerSection(BaseAppendSection):
         'polling_interval': FloatType(),
     }
 
+class RPCBrokerPredefinedQueuesSection(cconfig.Section):
+    def key_handler_to_all(self, key):
+        key = super().key_handler_to_all(key)
+        return key.replace('_fifo', '.fifo')
+
 
 class WorkerSection(BaseAppendSection):
     types_map = {
@@ -662,6 +667,7 @@ class DjangoEnv(environ.Env):
         'uwsgi': UWSGISection,
         'rpc': RPCSection,
         'rpc.broker_transport_options': RPCBrokerSection,
+        'rpc.broker_transport_options.predefined_queues': RPCBrokerPredefinedQueuesSection,
         'centrifugo': CentrifugoSection,
         'throttle': ThrottleSection,
         'storages.boto3': Boto3Subsection,
diff --git a/vstutils/static/img/logo/favicon.ico b/vstutils/static/favicon.ico
similarity index 100%
rename from vstutils/static/img/logo/favicon.ico
rename to vstutils/static/favicon.ico

From 05bba599d69d3f5c9d1f4fe5ef51f604a11c58db Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Wed, 26 Jun 2024 21:22:19 -0700
Subject: [PATCH 26/46] Fix(backend): Recursive redirect to admin login on
 newer asgiref.

---
 requirements.txt            | 1 +
 test_src/test_proj/tests.py | 5 +++++
 vstutils/asgi.py            | 8 ++++----
 vstutils/drivers/cache.py   | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index db9d302c..8682e74c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,6 +18,7 @@ pyuwsgi==2.0.23.post0
 # uwsgi==2.0.23
 fastapi-slim~=0.111.0
 aiofiles==23.2.1
+asgiref>=3.8.1
 
 # Notifications
 cent~=4.1.0
diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index 0cb4123d..00c8889e 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -800,6 +800,11 @@ def test_main_views(self):
         response = fclient.get('/favicon.ico')
         self.assertEqual(response.status_code, 200)
 
+        response = fclient.get('/admin/')
+        self.assertEqual(response.status_code, 200)
+        response = fclient.get('/admin/login/')
+        self.assertEqual(response.status_code, 200)
+
         # 404
         self.get_result('get', '/api/v1/some/', code=404)
         self.get_result('get', '/other_invalid_url/', code=404)
diff --git a/vstutils/asgi.py b/vstutils/asgi.py
index 124ca532..73f96866 100644
--- a/vstutils/asgi.py
+++ b/vstutils/asgi.py
@@ -153,10 +153,6 @@ async def serve_spa(file_path: str, request: Request):
 
 if settings.ENABLE_ADMIN_PANEL:
     class ASGIRequest(ASGIHandler.request_class):
-        def __init__(self, scope, body_file):  # nocv
-            scope['root_path'] = ""
-            super().__init__(scope, body_file)
-
         @functools.cached_property
         def urlconf(self):  # nocv
             # pylint: disable=import-outside-toplevel
@@ -166,6 +162,10 @@ def urlconf(self):  # nocv
     class AdminASGIHandler(ASGIHandler):
         request_class = ASGIRequest
 
+        async def __call__(self, scope, receive, send):  # nocv
+            scope['root_path'] = ""
+            return await super().__call__(scope, receive, send)
+
     with override_settings(MIDDLEWARE=settings.ADMIN_MIDDLEWARE):
         django_admin_app = AdminASGIHandler()
 
diff --git a/vstutils/drivers/cache.py b/vstutils/drivers/cache.py
index 1547adb8..2adee58e 100644
--- a/vstutils/drivers/cache.py
+++ b/vstutils/drivers/cache.py
@@ -68,7 +68,7 @@ def client(self):
         host, _, port = self._servers.rpartition(':')
         user = self._options.get('user', 'guest')
         password = self._options.get('password')
-        client = tarantool.connect(host, int(port), user, password)
+        client = tarantool.connect(host, int(port), None, user, password)
         return client
 
     @cached_property

From 354297b1cb77840818657566a143161d18974bce Mon Sep 17 00:00:00 2001
From: Dmitriy Ovcharenko <ovcharenkodd@gmail.com>
Date: Fri, 28 Jun 2024 13:00:00 +1000
Subject: [PATCH 27/46] Fix(backend): Adding or fixing functionality from
 previous releases.

---
 .gitlab-ci.yml                                |  2 +-
 doc/backend.rst                               |  5 +-
 doc/config.rst                                |  3 +-
 package.json                                  |  4 +-
 test_src/test_proj/settings.py                |  4 ++
 test_src/test_proj/test_settings.ini          |  1 -
 test_src/test_proj/tests.py                   | 27 ++++++++
 .../test_proj/user_claims_auth_backend.py     | 20 ++++++
 vstutils/__init__.py                          |  2 +-
 vstutils/api/auth.py                          |  4 +-
 vstutils/api/base.py                          | 61 +++----------------
 vstutils/api/base.pyi                         |  8 ---
 vstutils/api/schema/views.py                  |  3 +-
 vstutils/asgi.py                              |  2 +-
 vstutils/oauth2/anonymous.py                  | 10 +++
 vstutils/oauth2/authorization_code.py         |  6 +-
 vstutils/oauth2/authorization_server.py       | 14 ++---
 vstutils/oauth2/user.py                       | 15 ++++-
 vstutils/settings.py                          |  8 ++-
 vstutils/utils.py                             | 53 ++++++++++++++++
 vstutils/utils.pyi                            |  8 +++
 21 files changed, 171 insertions(+), 89 deletions(-)
 create mode 100644 test_src/test_proj/user_claims_auth_backend.py
 create mode 100644 vstutils/oauth2/anonymous.py

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 73eb2450..20de6088 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,7 +50,7 @@ stages:
 
 .js_tests_template: &branch_js_tests
   <<: *branch_tests
-  image: registry.gitlab.com/vstconsulting/images:node18-tests
+  image: registry.gitlab.com/vstconsulting/images:node20-tests
   before_script:
     - yarn install --pure-lockfile --mutex network
   script:
diff --git a/doc/backend.rst b/doc/backend.rst
index 31f13fa4..5795468d 100644
--- a/doc/backend.rst
+++ b/doc/backend.rst
@@ -102,7 +102,10 @@ Here is main functionality provided for working with ETag's mechanism:
 
 
 .. automodule:: vstutils.api.base
-    :members: CachableHeadMixin,check_request_etag,get_etag_value,EtagDependency
+    :members: CachableHeadMixin,get_etag_value,EtagDependency
+
+.. automodule:: vstutils.utils
+    :members: check_request_etag
 
 Actions
 ~~~~~~~
diff --git a/doc/config.rst b/doc/config.rst
index 42acb751..6009265b 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -365,7 +365,6 @@ Developers often switch between these backends based on the context of their wor
 * **password** - Auth password for smtp-server connection. Default: ``""``.
 * **tls** - Enable/disable tls for smtp-server connection. Default: ``False``.
 * **send_confirmation** - Enable/disable confirmation message after registration. Default: ``False``.
-* **authenticate_after_registration** - Enable/disable autologin after registration confirmation. Default: ``False``.
 
 
 .. _web:
@@ -872,7 +871,7 @@ This section contains additional information for configure additional elements.
    For project without special settings and project levels named ``project`` these variables will start with ``PROJECT_`` prefix.
    There is a list of these variables: ``{ENV_NAME}_ENABLE_ADMIN_PANEL``, ``{ENV_NAME}_ENABLE_REGISTRATION``, ``{ENV_NAME}_MAX_TFA_ATTEMPTS``,
    ``{ENV_NAME}_ETAG_TIMEOUT``, ``{ENV_NAME}_SEND_CONFIRMATION_EMAIL``, ``{ENV_NAME}_SEND_EMAIL_RETRIES``,
-   ``{ENV_NAME}_SEND_EMAIL_RETRY_DELAY``, ``{ENV_NAME}_AUTHENTICATE_AFTER_REGISTRATION``,
+   ``{ENV_NAME}_SEND_EMAIL_RETRY_DELAY``,
    ``{ENV_NAME}_MEDIA_ROOT`` (dir with uploads), ``{ENV_NAME}_GLOBAL_THROTTLE_RATE``,
    and ``{ENV_NAME}_GLOBAL_THROTTLE_ACTIONS``.
 
diff --git a/package.json b/package.json
index 654c1b22..fbcd388b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vstconsulting/vstutils",
-  "version": "5.10.0b9",
+  "version": "5.10.0b14",
   "type": "module",
   "author": "VST Consulting",
   "license": "Apache-2.0",
@@ -12,7 +12,7 @@
     "url": "git+https://gitlab.com/vstconsulting/vstutils.git"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.15.0"
   },
   "exports": {
     ".": {
diff --git a/test_src/test_proj/settings.py b/test_src/test_proj/settings.py
index 8f71331d..a2bade64 100644
--- a/test_src/test_proj/settings.py
+++ b/test_src/test_proj/settings.py
@@ -14,6 +14,10 @@
 MIDDLEWARE.insert(8, 'django.contrib.auth.middleware.AuthenticationMiddleware')
 MIDDLEWARE.insert(9, 'django.contrib.messages.middleware.MessageMiddleware')
 
+AUTHENTICATION_BACKENDS.append(
+    'test_proj.user_claims_auth_backend.CustomUserAuthBackend',
+)
+
 HEALTH_BACKEND_CLASS = 'test_proj.health.TestDefaultBackend'
 
 API['v2'] = {}
diff --git a/test_src/test_proj/test_settings.ini b/test_src/test_proj/test_settings.ini
index 1d62ecdc..37ea399e 100644
--- a/test_src/test_proj/test_settings.ini
+++ b/test_src/test_proj/test_settings.ini
@@ -95,7 +95,6 @@ logfile = /var/log/test_proj2/{__section}.log
 notificator_client_class = test_proj.test_notificator.DummyNotificator
 
 [mail]
-authenticate_after_registration = True
 send_confirmation = True
 
 [storages.libcloud.aws]
diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index 00c8889e..94d62c28 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -7606,3 +7606,30 @@ def test_bulk_request_will_not_revoke_token(self):
             headers={'authorization': f'Bearer {access_token}'},
         )
         self.assertEqual(response.status_code, 200)
+
+    def test_custom_user_claims(self):
+        response = self.client_class().post(
+            '/api/oauth2/token/',
+            content_type='application/json',
+            data={
+                'client_id': 'test-client',
+                'client_secret': 'test-client-secret',
+                'grant_type': 'password',
+                'scope': 'openid',
+                'username': 'custom_user',
+                'password': '',
+            },
+        )
+        self.assertEqual(response.status_code, 200)
+
+        access_token = jwt.decode(
+            response.json()['access_token'],
+            oauth2_server_jwk_set,
+        )
+        self.assertTrue(access_token['some_claim'])
+
+        id_token = jwt.decode(
+            response.json()['id_token'],
+            oauth2_server_jwk_set,
+        )
+        self.assertEqual(id_token['locale'], 'fr-CA')
diff --git a/test_src/test_proj/user_claims_auth_backend.py b/test_src/test_proj/user_claims_auth_backend.py
new file mode 100644
index 00000000..56d77d89
--- /dev/null
+++ b/test_src/test_proj/user_claims_auth_backend.py
@@ -0,0 +1,20 @@
+from django.contrib.auth.backends import BaseBackend
+from django.contrib.auth.models import AnonymousUser
+
+
+class CustomUser(AnonymousUser):
+    def get_profile_claims(self):
+        return {
+            'locale': 'fr-CA',
+        }
+
+    def get_access_token_claims(self):
+        return {
+            'some_claim': True,
+        }
+
+
+class CustomUserAuthBackend(BaseBackend):
+    def authenticate(self, request, username, password):
+        if username == 'custom_user':
+            return CustomUser()
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index be14eb09..14b3fcca 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b13'
+__version__: str = '5.10.0b14'
diff --git a/vstutils/api/auth.py b/vstutils/api/auth.py
index 67ed6dd8..8869cced 100644
--- a/vstutils/api/auth.py
+++ b/vstutils/api/auth.py
@@ -198,7 +198,9 @@ class LanguageFromRequestDefault:
     requires_context = True
 
     def __call__(self, serializer_field):
-        return serializer_field.context['request'].language.code
+        if language := getattr(serializer_field.context['request'], 'language', None):
+            return language.code
+        return settings.LANGUAGE_CODE
 
 
 class MainSettingsSerializer(BaseSerializer):
diff --git a/vstutils/api/base.py b/vstutils/api/base.py
index a8d96ef6..2a30fe3f 100644
--- a/vstutils/api/base.py
+++ b/vstutils/api/base.py
@@ -27,7 +27,13 @@
 from rest_framework.schemas import AutoSchema as DRFAutoSchema
 from rest_framework.utils.serializer_helpers import ReturnList, ReturnDict
 
-from ..utils import classproperty, get_if_lazy, raise_context_decorator_with_default, patch_gzip_response_decorator
+from ..utils import (
+    classproperty,
+    get_if_lazy,
+    raise_context_decorator_with_default,
+    patch_gzip_response_decorator,
+    check_request_etag,
+)
 from .. import exceptions as vstexceptions
 from . import responses, fields
 from .filter_backends import get_serializer_readable_fields
@@ -565,59 +571,6 @@ class EtagDependency(enum.Flag):
     """ Indicates dependency on the user's language preference. """
 
 
-def check_request_etag(request, etag_value, header_name="If-None-Match", operation_handler=str.__eq__):
-    """
-    The function plays a crucial role within the context of the ETag mechanism,
-    providing a flexible way to validate client-side ETags against the server-side version for both cache validation
-    and ensuring data consistency in web applications.
-    It supports conditional handling of HTTP requests based on the match or mismatch of ETag values,
-    accommodating various scenarios such as cache freshness checks and prevention of concurrent modifications.
-
-    :param request: The HTTP request object containing the client's headers,
-                    from which the ETag for comparison is retrieved.
-    :type request: :class:`rest_framework.request.Request`
-    :param etag_value: The server-generated ETag value that represents the current state of the resource.
-                       This unique identifier is recalculated whenever the resource's content changes.
-    :type etag_value: :class:`str`
-    :param header_name: Specifies the HTTP header to look for the client's ETag.
-                        Defaults to "If-None-Match", commonly used in GET requests for cache validation.
-                        For operations requiring confirmation that the client is acting on the latest version
-                        of a resource (e.g., PUT or DELETE), "If-Match" should be used instead.
-    :type header_name: :class:`str`
-    :param operation_handler: A function to compare the ETags. By default, this is set to ``str.__eq__``,
-                              which checks for an exact match between the client's and server's ETags,
-                              suitable for validating caches with ``If-None-Match``.
-                              To handle ``If-Match`` scenarios, where the operation should proceed only if the ETags
-                              do not match, indicating the resource has been modified, ``str.__ne__`` (not equal)
-                              can be used as the operation handler. This flexibility allows for precise control over how
-                              and when clients are allowed to read from or write to resources based on their version.
-
-    :return: Returns a tuple containing the server's ETag and a boolean flag.
-             The flag is ``True`` if the operation handler condition between the server's and client's ETag is met,
-             indicating the request should proceed based on the matching logic defined by the operation handler;
-             otherwise, it returns ``False``.
-    """
-    header = request.headers.get(header_name)
-
-    if not header:
-        return etag_value, False
-
-    header = str(header)
-    if header[:2] in {'W/', "w/"}:
-        header = header[2:]
-
-    if header[0] != '"':
-        header = f'"{header}"'
-
-    if etag_value[0] != '"':
-        etag_value = f'"{etag_value}"'
-
-    if operation_handler(etag_value, header):
-        return etag_value, True
-
-    return etag_value, False
-
-
 class CachableHeadMixin(GenericViewSet):
     """
     A mixin designed to enhance caching for GET responses in Django REST framework views,
diff --git a/vstutils/api/base.pyi b/vstutils/api/base.pyi
index 8f68010a..3e32a500 100644
--- a/vstutils/api/base.pyi
+++ b/vstutils/api/base.pyi
@@ -95,14 +95,6 @@ class EtagDependency(enum.Flag):
     SESSION: enum.auto()
     LANG: enum.auto()
 
-def check_request_etag(
-        request: Request,
-        etag_value: T,
-        header_name: _t.Text = "If-None-Match",
-        operation_handler: _t.Callable[[_t.Text, _t.Text], bool] = str.__eq__
-) -> _t.Tuple[T, bool]:
-    ...
-
 class CachableHeadMixin(GenericViewSet):
     class NotModifiedException(exceptions.APIException): ...
     class PreconditionFailedException(exceptions.APIException): ...
diff --git a/vstutils/api/schema/views.py b/vstutils/api/schema/views.py
index e1c5504f..288a1ceb 100644
--- a/vstutils/api/schema/views.py
+++ b/vstutils/api/schema/views.py
@@ -3,8 +3,9 @@
 from django.conf import settings
 from drf_yasg.views import get_schema_view
 from rest_framework import permissions, versioning
+from vstutils.utils import check_request_etag
 
-from ..base import check_request_etag, CachableHeadMixin
+from ..base import CachableHeadMixin
 
 
 class OpenApiView(get_schema_view()):  # type: ignore
diff --git a/vstutils/asgi.py b/vstutils/asgi.py
index 73f96866..160c2519 100644
--- a/vstutils/asgi.py
+++ b/vstutils/asgi.py
@@ -22,7 +22,7 @@
 from starlette.staticfiles import NotModifiedResponse
 
 from .signals import before_mount_app
-from .api.base import check_request_etag
+from .utils import check_request_etag
 
 if typing.TYPE_CHECKING:
     class ManifestProtocol(typing.Protocol):
diff --git a/vstutils/oauth2/anonymous.py b/vstutils/oauth2/anonymous.py
new file mode 100644
index 00000000..b34b553f
--- /dev/null
+++ b/vstutils/oauth2/anonymous.py
@@ -0,0 +1,10 @@
+from django.contrib.auth.backends import BaseBackend
+from django.contrib.auth.models import AnonymousUser
+
+
+class AnonymousUserAuthBackend(BaseBackend):
+    def authenticate(self, request, username, password):
+        if (
+            username == '' and password == ''  # nosec
+        ):
+            return AnonymousUser()
diff --git a/vstutils/oauth2/authorization_code.py b/vstutils/oauth2/authorization_code.py
index 2c79dce2..bf4a90e4 100644
--- a/vstutils/oauth2/authorization_code.py
+++ b/vstutils/oauth2/authorization_code.py
@@ -86,10 +86,13 @@ def get_jwt_config(self, grant):
         }
 
     def generate_user_info(self, user: UserWrapper, scope):
-        return UserInfo(
+        profile = UserInfo(
             sub=user.get_user_id(),
             anon=user.is_anon(),
         )
+        if profile_claims := user.get_profile_claims():
+            profile.update(profile_claims)
+        return profile
 
 
 class AuthorizationCodeGrant(BaseAuthorizationCodeGrant):
@@ -125,5 +128,6 @@ def delete_authorization_code(self, authorization_code: AuthorizationCode):
     def authenticate_user(self, authorization_code: AuthorizationCode):
         backend = load_backend(authorization_code.auth_backend_path)
         user = backend.get_user(authorization_code.user_id)
+        user.backend = authorization_code.auth_backend_path
         if user:
             return UserWrapper(user)
diff --git a/vstutils/oauth2/authorization_server.py b/vstutils/oauth2/authorization_server.py
index e29f6800..bd58783f 100644
--- a/vstutils/oauth2/authorization_server.py
+++ b/vstutils/oauth2/authorization_server.py
@@ -28,7 +28,6 @@
 from authlib.oauth2.rfc9068.claims import JWTAccessTokenClaims, JWTClaims
 from django.conf import settings
 from django.contrib.auth import authenticate, login, get_user
-from django.contrib.auth.models import AnonymousUser, AbstractBaseUser
 from django.utils.module_loading import import_string
 from vstutils.utils import get_session_store
 
@@ -40,9 +39,10 @@
 
 if TYPE_CHECKING:  # nocv
     from authlib.jose import KeySet
+    from django.contrib.auth.models import AbstractBaseUser
 
 
-extra_claims_provider: Optional[Callable[[AbstractBaseUser], Optional[dict]]] = (
+extra_claims_provider: 'Optional[Callable[[AbstractBaseUser], Optional[dict]]]' = (
     import_string(settings.OAUTH_SERVER_JWT_EXTRA_CLAIMS_PROVIDER)
     if settings.OAUTH_SERVER_JWT_EXTRA_CLAIMS_PROVIDER
     else None
@@ -99,6 +99,9 @@ def get_extra_claims(self, client: SimpleClient, grant_type, user: 'UserWrapper'
         if user.is_anon():
             claims['anon'] = True
 
+        if user_claims := user.get_access_token_claims():
+            claims.update(user_claims)
+
         if extra_claims_provider:
             if extra_claims := extra_claims_provider(user.django_user):
                 claims.update(extra_claims)
@@ -149,11 +152,6 @@ class ResourceOwnerPasswordCredentialsGrant(BaseResourceOwnerPasswordCredentials
     TOKEN_ENDPOINT_AUTH_METHODS = settings.OAUTH_SERVER_CLIENT_AUTHENTICATION_METHODS
 
     def authenticate_user(self, username, password):
-        if (
-            settings.OAUTH_SERVER_ENABLE_ANON_LOGIN and
-            username == '' and password == ''  # nosec
-        ):
-            return UserWrapper(AnonymousUser())
         user = authenticate(
             self.request._request,  # pylint: disable=protected-access
             username=username,
@@ -246,8 +244,6 @@ def _session(self):
     def get_user(self):
         if not self._session:
             return
-        if self.claims.get('anon'):
-            return UserWrapper(AnonymousUser())
         user = get_user(self.RequestMock(self._session))
         if user:
             return UserWrapper(user)
diff --git a/vstutils/oauth2/user.py b/vstutils/oauth2/user.py
index b89484b1..8ff8223f 100644
--- a/vstutils/oauth2/user.py
+++ b/vstutils/oauth2/user.py
@@ -1,16 +1,15 @@
 from typing import Optional, Union, TYPE_CHECKING
 from uuid import uuid4
 
-from django.contrib.auth.models import AbstractBaseUser, AnonymousUser
-
 if TYPE_CHECKING:  # nocv
+    from django.contrib.auth.models import AbstractBaseUser, AnonymousUser
     from .requests import DjangoOAuth2Request
 
 
 class UserWrapper:
     request: 'Optional[DjangoOAuth2Request]' = None
 
-    def __init__(self, user: Union[AbstractBaseUser, AnonymousUser]):
+    def __init__(self, user: 'Union[AbstractBaseUser, AnonymousUser]'):
         self.django_user = user
         self.pk: str = (
             f'anon_{uuid4().hex}'
@@ -30,3 +29,13 @@ def second_factor_required(self):
 
     def validate_second_factor(self, code):
         return self.django_user.twofa.verify(code)
+
+    def get_profile_claims(self) -> Optional[dict]:
+        if hasattr(self.django_user, 'get_profile_claims'):
+            return self.django_user.get_profile_claims()
+        return None
+
+    def get_access_token_claims(self) -> Optional[dict]:
+        if hasattr(self.django_user, 'get_access_token_claims'):
+            return self.django_user.get_access_token_claims()
+        return None
diff --git a/vstutils/settings.py b/vstutils/settings.py
index 0e2bfe32..8dec1565 100644
--- a/vstutils/settings.py
+++ b/vstutils/settings.py
@@ -338,7 +338,6 @@ class MailSection(BaseAppendSection):
         'tls': ConfigBoolType,
         'ssl': ConfigBoolType,
         'send_confirmation': ConfigBoolType,
-        'authenticate_after_registration': ConfigBoolType,
         'agreement_terms': ConfigBoolType,
     }
 
@@ -564,7 +563,6 @@ class DjangoEnv(environ.Env):
             'send_confirmation': os.getenv(f'{ENV_NAME}_SEND_CONFIRMATION_EMAIL', False),
             'send_email_retries': os.getenv(f'{ENV_NAME}_SEND_EMAIL_RETRIES', 3),
             'send_email_retry_delay': os.getenv(f'{ENV_NAME}_SEND_EMAIL_RETRY_DELAY', 10),
-            'authenticate_after_registration': os.getenv(f'{ENV_NAME}_AUTHENTICATE_AFTER_REGISTRATION', False),
         },
         'contact': {
             'name': 'System Administrator'
@@ -1084,7 +1082,6 @@ def parse_db(params):
 SEND_CONFIRMATION_EMAIL: bool = mail["send_confirmation"]
 SEND_EMAIL_RETRIES: int = mail['send_email_retries']
 SEND_MESSAGE_RETRY_DELAY: int = mail['send_email_retry_delay']
-AUTHENTICATE_AFTER_REGISTRATION: bool = mail["authenticate_after_registration"]
 REGISTRATION_HASHERS: tuple = mail.getlist(
     'send_confirmation_uid_hashers',
     'django.contrib.auth.hashers.MD5PasswordHasher'
@@ -1591,6 +1588,11 @@ class OauthServerClientConfig(_t.TypedDict):
     if config['oauth']['server_allow_insecure']:
         os.environ['AUTHLIB_INSECURE_TRANSPORT'] = '1'
 
+    if OAUTH_SERVER_ENABLE_ANON_LOGIN:
+        AUTHENTICATION_BACKENDS.append(
+            'vstutils.oauth2.anonymous.AnonymousUserAuthBackend',
+        )
+
     API['oauth2'].update({
         'token': {
             'view': 'vstutils.oauth2.endpoints.TokenViewSet',
diff --git a/vstutils/utils.py b/vstutils/utils.py
index 56db2465..5ac0684f 100644
--- a/vstutils/utils.py
+++ b/vstutils/utils.py
@@ -1479,3 +1479,56 @@ def add_in_vary(headers: dict, value: str):
     if value not in vary:
         vary.append(value)
         headers['Vary'] = ', '.join(vary)
+
+
+def check_request_etag(request, etag_value, header_name="If-None-Match", operation_handler=str.__eq__):
+    """
+    The function plays a crucial role within the context of the ETag mechanism,
+    providing a flexible way to validate client-side ETags against the server-side version for both cache validation
+    and ensuring data consistency in web applications.
+    It supports conditional handling of HTTP requests based on the match or mismatch of ETag values,
+    accommodating various scenarios such as cache freshness checks and prevention of concurrent modifications.
+
+    :param request: The HTTP request object containing the client's headers,
+                    from which the ETag for comparison is retrieved.
+    :type request: :class:`rest_framework.request.Request`
+    :param etag_value: The server-generated ETag value that represents the current state of the resource.
+                       This unique identifier is recalculated whenever the resource's content changes.
+    :type etag_value: :class:`str`
+    :param header_name: Specifies the HTTP header to look for the client's ETag.
+                        Defaults to "If-None-Match", commonly used in GET requests for cache validation.
+                        For operations requiring confirmation that the client is acting on the latest version
+                        of a resource (e.g., PUT or DELETE), "If-Match" should be used instead.
+    :type header_name: :class:`str`
+    :param operation_handler: A function to compare the ETags. By default, this is set to ``str.__eq__``,
+                              which checks for an exact match between the client's and server's ETags,
+                              suitable for validating caches with ``If-None-Match``.
+                              To handle ``If-Match`` scenarios, where the operation should proceed only if the ETags
+                              do not match, indicating the resource has been modified, ``str.__ne__`` (not equal)
+                              can be used as the operation handler. This flexibility allows for precise control over how
+                              and when clients are allowed to read from or write to resources based on their version.
+
+    :return: Returns a tuple containing the server's ETag and a boolean flag.
+             The flag is ``True`` if the operation handler condition between the server's and client's ETag is met,
+             indicating the request should proceed based on the matching logic defined by the operation handler;
+             otherwise, it returns ``False``.
+    """
+    header = request.headers.get(header_name)
+
+    if not header:
+        return etag_value, False
+
+    header = str(header)
+    if header[:2] in {'W/', "w/"}:
+        header = header[2:]
+
+    if header[0] != '"':
+        header = f'"{header}"'
+
+    if etag_value[0] != '"':
+        etag_value = f'"{etag_value}"'
+
+    if operation_handler(etag_value, header):
+        return etag_value, True
+
+    return etag_value, False
diff --git a/vstutils/utils.pyi b/vstutils/utils.pyi
index fb82a8a6..c8197058 100644
--- a/vstutils/utils.pyi
+++ b/vstutils/utils.pyi
@@ -529,3 +529,11 @@ def get_session_store():
 
 def add_in_vary(headers: dict, value: str):
     ...
+
+def check_request_etag(
+        request: Request,
+        etag_value: T,
+        header_name: tp.Text = "If-None-Match",
+        operation_handler: tp.Callable[[tp.Text, tp.Text], bool] = str.__eq__
+) -> tp.Tuple[T, bool]:
+    ...

From 6c474855bf709c6906c5eec9442cad5b28c178e8 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite@mail.ru>
Date: Mon, 8 Jul 2024 13:53:28 +1000
Subject: [PATCH 28/46] Release 5.10.0b15

---
 doc/locale/ru/LC_MESSAGES/config.po | 372 ++++++++++++++--------------
 pyproject.toml                      |   2 +-
 requirements-prod.txt               |   2 +-
 requirements-stubs.txt              |   4 +-
 requirements-test.txt               |   2 +-
 requirements.txt                    |   2 +-
 test_src/test_proj/models/files.py  |  15 ++
 test_src/test_proj/tests.py         |   5 +
 test_src/test_proj/views.py         |  21 +-
 tox.ini                             |   4 +-
 vstutils/__init__.py                |   2 +-
 vstutils/api/base.py                |  29 +++
 vstutils/api/base.pyi               |  19 ++
 vstutils/api/filter_backends.py     |   9 +-
 vstutils/api/schema/inspectors.py   |   9 +-
 vstutils/api/schema/schema.py       |   1 +
 16 files changed, 295 insertions(+), 203 deletions(-)

diff --git a/doc/locale/ru/LC_MESSAGES/config.po b/doc/locale/ru/LC_MESSAGES/config.po
index 736d0996..ad1e5600 100644
--- a/doc/locale/ru/LC_MESSAGES/config.po
+++ b/doc/locale/ru/LC_MESSAGES/config.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VST Utils 5.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-11 22:49+0000\n"
+"POT-Creation-Date: 2024-07-05 05:59+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1017,24 +1017,15 @@ msgstr ""
 "**send_confirmation** - Включить или отключить отправку сообщения с "
 "подтверждением после регистрации. По умолчанию: ``False``."
 
-#: ../../config.rst:368
-msgid ""
-"**authenticate_after_registration** - Enable/disable autologin after "
-"registration confirmation. Default: ``False``."
-msgstr ""
-"**authenticate_after_registration** - Включить или отключить "
-"автоматический вход пользователя после подтверждения регистрации. По "
-"умолчанию: ``False``."
-
-#: ../../config.rst:374
+#: ../../config.rst:373
 msgid "Web settings"
 msgstr "Web-настройки"
 
-#: ../../config.rst:376
+#: ../../config.rst:375
 msgid "Section ``[web]``."
 msgstr "Раздел ``[web]``."
 
-#: ../../config.rst:378
+#: ../../config.rst:377
 msgid ""
 "These settings are related to web-server. Those settings includes: "
 "session_timeout, static_files_url and pagination limit."
@@ -1042,13 +1033,13 @@ msgstr ""
 "Эти настройки относятся к веб-серверу. Среди них: session_timeout, "
 "static_files_url и лимит пагинации."
 
-#: ../../config.rst:381
+#: ../../config.rst:380
 msgid "**allow_cors** - enable cross-origin resource sharing. Default: ``False``."
 msgstr ""
 "**allow_cors** - включить cross-origin resource sharing. По умолчанию: "
 "``False``."
 
-#: ../../config.rst:382
+#: ../../config.rst:381
 msgid ""
 "**cors_allowed_origins**, **cors_allowed_origins_regexes**, "
 "**cors_expose_headers**, **cors_allow_methods**, **cors_allow_headers**, "
@@ -1062,7 +1053,7 @@ msgstr ""
 "/django-cors-headers#configuration>`_ из библиотеки ``django-cors-"
 "headers`` со значениями по умолчанию."
 
-#: ../../config.rst:385
+#: ../../config.rst:384
 msgid ""
 "**enable_gravatar** - Enable/disable gravatar service using for users. "
 "Default: ``True``."
@@ -1070,7 +1061,7 @@ msgstr ""
 "**enable_gravatar** - Включить/отключить использование сервиса Gravatar "
 "для пользователей. По умолчанию: ``True``."
 
-#: ../../config.rst:386
+#: ../../config.rst:385
 msgid ""
 "**rest_swagger_description** - Help string in Swagger schema. Useful for "
 "dev-integrations."
@@ -1078,7 +1069,7 @@ msgstr ""
 "**rest_swagger_description** - Строка справки в схеме Swagger. Полезно "
 "для разработки интеграций."
 
-#: ../../config.rst:387
+#: ../../config.rst:386
 msgid ""
 "**openapi_cache_timeout** - Cache timeout for storing schema data. "
 "Default: ``120``."
@@ -1086,7 +1077,7 @@ msgstr ""
 "**openapi_cache_timeout** - Время кэширования данных схемы. По умолчанию:"
 " ``120``."
 
-#: ../../config.rst:388
+#: ../../config.rst:387
 msgid ""
 "**health_throttle_rate** - Count of requests to ``/api/health/`` "
 "endpoint. Default: ``60``."
@@ -1094,7 +1085,7 @@ msgstr ""
 "Количество запросов к конечной точке ``/api/health/``. По умолчанию: "
 "``60``."
 
-#: ../../config.rst:389
+#: ../../config.rst:388
 msgid ""
 "**bulk_threads** - Threads count for PATCH ``/api/endpoint/`` endpoint. "
 "Default: ``3``."
@@ -1102,13 +1093,13 @@ msgstr ""
 "**bulk_threads** - Количество потоков для PATCH ``/api/endpoint/``. По "
 "умолчанию: ``3``."
 
-#: ../../config.rst:390
+#: ../../config.rst:389
 msgid "**session_timeout** - Session lifetime. Default: ``2w`` (two weeks)."
 msgstr ""
 "**session_timeout** - Время жизни сессии. По умолчанию: ``2w`` (две "
 "недели)."
 
-#: ../../config.rst:391
+#: ../../config.rst:390
 msgid ""
 "**etag_default_timeout** - Cache timeout for Etag headers to control "
 "models caching. Default: ``1d`` (one day)."
@@ -1116,7 +1107,7 @@ msgstr ""
 "**etag_default_timeout** -  Время кэширования заголовков Etag для "
 "управления кэшированием моделей. По умолчанию: ``1d`` (один день)."
 
-#: ../../config.rst:392
+#: ../../config.rst:391
 msgid ""
 "**rest_page_limit** and **page_limit** - Default limit of objects in API "
 "list. Default: ``1000``."
@@ -1124,7 +1115,7 @@ msgstr ""
 "**rest_page_limit** and **page_limit** - Максимальное количество объектов"
 " в списке API. По умолчанию: ``1000``."
 
-#: ../../config.rst:393
+#: ../../config.rst:392
 msgid ""
 "**session_cookie_domain** - The domain to use for session cookies. Read "
 ":django_docs:`more <settings/#std:setting-SESSION_COOKIE_DOMAIN>`. "
@@ -1134,7 +1125,7 @@ msgstr ""
 ":django_docs:`Подробнее <settings/#std:setting-SESSION_COOKIE_DOMAIN>`. "
 "По умолчанию: ``None``."
 
-#: ../../config.rst:395
+#: ../../config.rst:394
 msgid ""
 "**csrf_trusted_origins** - A list of hosts which are trusted origins for "
 "unsafe requests. Read :django_docs:`more <settings/#csrf-trusted-"
@@ -1144,7 +1135,7 @@ msgstr ""
 " запросы. :django_docs:`Подробнее <settings/#csrf-trusted-origins>`. По "
 "умолчанию: значение из **session_cookie_domain**."
 
-#: ../../config.rst:397
+#: ../../config.rst:396
 msgid ""
 "**case_sensitive_api_filter** - Enables/disables case sensitive search "
 "for name filtering. Default: ``True``."
@@ -1152,7 +1143,7 @@ msgstr ""
 "**case_sensitive_api_filter** - Включить/отключить чувствительность к "
 "регистру при фильтрации по имени. По умолчанию: ``True``."
 
-#: ../../config.rst:399
+#: ../../config.rst:398
 msgid ""
 "**secure_proxy_ssl_header_name** - Header name which activates SSL urls "
 "in responses. Read :django_docs:`more <settings/#secure-proxy-ssl-"
@@ -1163,7 +1154,7 @@ msgstr ""
 "<settings/#secure-proxy-ssl-header>`. По умолчанию: "
 "``HTTP_X_FORWARDED_PROTOCOL``."
 
-#: ../../config.rst:401
+#: ../../config.rst:400
 msgid ""
 "**secure_proxy_ssl_header_value** - Header value which activates SSL urls"
 " in responses. Read :django_docs:`more <settings/#secure-proxy-ssl-"
@@ -1174,7 +1165,7 @@ msgstr ""
 ":django_docs:`Подробнее <settings/#secure-proxy-ssl-header>`. По "
 "умолчанию: ``https``."
 
-#: ../../config.rst:405
+#: ../../config.rst:404
 msgid ""
 "The following variables from Django settings are also supported (with the"
 " corresponding types):"
@@ -1182,70 +1173,70 @@ msgstr ""
 "Также поддерживаются следующие переменные из настроек Django (с "
 "соответствующими типами):"
 
-#: ../../config.rst:407
+#: ../../config.rst:406
 msgid ""
 "**secure_browser_xss_filter** - :django_docs:`SECURE_BROWSER_XSS_FILTER "
 "<settings/#secure-browser-xss-filter>`"
 msgstr ""
 
-#: ../../config.rst:408
+#: ../../config.rst:407
 msgid ""
 "**secure_content_type_nosniff** - "
 ":django_docs:`SECURE_CONTENT_TYPE_NOSNIFF <settings/#secure-content-type-"
 "nosniff>`"
 msgstr ""
 
-#: ../../config.rst:409
+#: ../../config.rst:408
 msgid ""
 "**secure_hsts_include_subdomains** - "
 ":django_docs:`SECURE_HSTS_INCLUDE_SUBDOMAINS <settings/#secure-hsts-"
 "include-subdomains>`"
 msgstr ""
 
-#: ../../config.rst:410
+#: ../../config.rst:409
 msgid ""
 "**secure_hsts_preload** - :django_docs:`SECURE_HSTS_PRELOAD <settings"
 "/#secure-hsts-preload>`"
 msgstr ""
 
-#: ../../config.rst:411
+#: ../../config.rst:410
 msgid ""
 "**secure_hsts_seconds** - :django_docs:`SECURE_HSTS_SECONDS <settings"
 "/#secure-hsts-seconds>`"
 msgstr ""
 
-#: ../../config.rst:412
+#: ../../config.rst:411
 msgid ""
 "**password_reset_timeout_days** - "
 ":django_docs:`PASSWORD_RESET_TIMEOUT_DAYS <settings/#std:setting-"
 "PASSWORD_RESET_TIMEOUT>`"
 msgstr ""
 
-#: ../../config.rst:413
+#: ../../config.rst:412
 msgid ""
 "**request_max_size** - :django_docs:`DATA_UPLOAD_MAX_MEMORY_SIZE "
 "<settings/#std:setting-DATA_UPLOAD_MAX_MEMORY_SIZE>`"
 msgstr ""
 
-#: ../../config.rst:414
+#: ../../config.rst:413
 msgid ""
 "**x_frame_options** - :django_docs:`X_FRAME_OPTIONS <settings/#x-frame-"
 "options>`"
 msgstr ""
 
-#: ../../config.rst:415
+#: ../../config.rst:414
 msgid ""
 "**use_x_forwarded_host** - :django_docs:`USE_X_FORWARDED_HOST "
 "<settings/#use-x-forwarded-host>`"
 msgstr ""
 
-#: ../../config.rst:416
+#: ../../config.rst:415
 msgid ""
 "**use_x_forwarded_port** - :django_docs:`USE_X_FORWARDED_PORT "
 "<settings/#use-x-forwarded-port>`"
 msgstr ""
 
-#: ../../config.rst:418
+#: ../../config.rst:417
 msgid ""
 "The following settings affects prometheus metrics endpoint (which can be "
 "used for monitoring application):"
@@ -1253,7 +1244,7 @@ msgstr ""
 "Следующие настройки влияют на эндпоинт метрик Prometheus (который может "
 "использоваться для мониторинга приложения):"
 
-#: ../../config.rst:420
+#: ../../config.rst:419
 msgid ""
 "**metrics_throttle_rate** - Count of requests to ``/api/metrics/`` "
 "endpoint. Default: ``120``."
@@ -1261,7 +1252,7 @@ msgstr ""
 "**metrics_throttle_rate** - Количество запросов к эндпоинту "
 "``/api/metrics/``. По умолчанию: ``120``."
 
-#: ../../config.rst:421
+#: ../../config.rst:420
 msgid ""
 "**enable_metrics** - Enable/disable ``/api/metrics/`` endpoint for app. "
 "Default: ``true``"
@@ -1269,7 +1260,7 @@ msgstr ""
 "**enable_metrics** - Включить/отключить эндпоинт ``/api/metrics/`` для "
 "приложения. По умолчанию: ``true``."
 
-#: ../../config.rst:422
+#: ../../config.rst:421
 msgid ""
 "**metrics_backend** - Python class path with metrics collector backend. "
 "Default: ``vstutils.api.metrics.DefaultBackend`` Default backend collects"
@@ -1279,11 +1270,11 @@ msgstr ""
 " умолчанию: ``vstutils.api.metrics.DefaultBackend``. Стандартный бэкенд "
 "собирает метрики из рабочих процессов uwsgi и информацию о версии Python."
 
-#: ../../config.rst:426
+#: ../../config.rst:425
 msgid "Section ``[uvicorn]``."
 msgstr "Раздел ``[uvicorn]``."
 
-#: ../../config.rst:428
+#: ../../config.rst:427
 msgid ""
 "You can configure the necessary settings to run the uvicorn server. "
 "``vstutils`` supports almost all options from the cli, except for those "
@@ -1293,21 +1284,21 @@ msgstr ""
 "``vstutils`` поддерживает практически все опции из командной строки, за "
 "исключением тех, которые настраивают приложение и соединение."
 
-#: ../../config.rst:431
+#: ../../config.rst:430
 msgid "See all available uvicorn settings via ``uvicorn --help`` command."
 msgstr ""
 "Вы можете посмотреть все доступные настройки uvicorn, введя команду "
 "``uvicorn --help``"
 
-#: ../../config.rst:436
+#: ../../config.rst:435
 msgid "Centrifugo client settings"
 msgstr "Настройки клиента Centrifugo"
 
-#: ../../config.rst:438
+#: ../../config.rst:437
 msgid "Section ``[centrifugo]``."
 msgstr "Раздел ``[centrifugo]``."
 
-#: ../../config.rst:440
+#: ../../config.rst:439
 msgid ""
 "Centrifugo is employed to optimize real-time data updates within a Django"
 " application by orchestrating seamless communication among its various "
@@ -1351,7 +1342,7 @@ msgstr ""
 "мгновенное и синхронизированное обновление данных, способствуя "
 "высококачественному пользовательскому опыту."
 
-#: ../../config.rst:454
+#: ../../config.rst:453
 msgid ""
 "To install app with centrifugo client, ``[centrifugo]`` section must be "
 "set. Centrifugo is used by application to auto-update page data. When "
@@ -1366,27 +1357,27 @@ msgstr ""
 "первичным ключом. Без этой службы все клиенты GUI получают данные "
 "страницы каждые 5 секунд (по умолчанию)."
 
-#: ../../config.rst:460
+#: ../../config.rst:459
 msgid "**address** - Centrifugo server address."
 msgstr "**address** - Адрес сервера Centrifugo."
 
-#: ../../config.rst:461
+#: ../../config.rst:460
 msgid "**api_key** - API key for clients."
 msgstr "**api_key** - Ключ API для клиентов."
 
-#: ../../config.rst:462
+#: ../../config.rst:461
 msgid "**token_hmac_secret_key** - API key for jwt-token generation."
 msgstr "**token_hmac_secret_key** - Ключ API для генерации JWT-токена."
 
-#: ../../config.rst:463
+#: ../../config.rst:462
 msgid "**timeout** - Connection timeout."
 msgstr "**timeout** - Таймаут подключения."
 
-#: ../../config.rst:464
+#: ../../config.rst:463
 msgid "**verify** - Connection verification."
 msgstr "**verify** - Проверка подключения."
 
-#: ../../config.rst:465
+#: ../../config.rst:464
 msgid ""
 "**subscriptions_prefix** - Prefix used for generating update channels, by"
 " default \"{VST_PROJECT}.update\"."
@@ -1394,7 +1385,7 @@ msgstr ""
 "**subscriptions_prefix** -  Префикс, используемый для генерации каналов "
 "обновления, по умолчанию \"{VST_PROJECT}.update\"."
 
-#: ../../config.rst:468
+#: ../../config.rst:467
 msgid ""
 "These settings also add parameters to the OpenAPI schema and change how "
 "the auto-update system works in the GUI. ``token_hmac_secret_key`` is "
@@ -1406,15 +1397,15 @@ msgstr ""
 "генерации JWT-токена (на основе времени истечения сессии). Токен будет "
 "использоваться для клиента Centrifugo-JS."
 
-#: ../../config.rst:476
+#: ../../config.rst:475
 msgid "Storage settings"
 msgstr "Настройки хранилища"
 
-#: ../../config.rst:478
+#: ../../config.rst:477
 msgid "Section ``[storages]``."
 msgstr "Раздел ``[storages]``."
 
-#: ../../config.rst:480
+#: ../../config.rst:479
 msgid ""
 "Applications based on ``vstutils`` supports filesystem storage out of "
 "box. Setup ``media_root`` and ``media_url`` in ``[storages.filesystem]`` "
@@ -1427,7 +1418,7 @@ msgstr ""
 "``media_url`` в разделе [storages.filesystem]. По умолчанию они будут "
 "равны ``{/path/to/project/module}/media`` и ``/media/``."
 
-#: ../../config.rst:485
+#: ../../config.rst:484
 msgid ""
 "Applications based on ``vstutils`` supports store files in external "
 "services with `Apache Libcloud <http://libcloud.apache.org/>`_ and `Boto3"
@@ -1438,7 +1429,7 @@ msgstr ""
 "<http://libcloud.apache.org/>`_ и `Boto3 "
 "<https://boto3.amazonaws.com/v1/documentation/api/latest/index.html>`_."
 
-#: ../../config.rst:488
+#: ../../config.rst:487
 msgid ""
 "Apache Libcloud settings grouped by sections named "
 "``[storages.libcloud.provider]``, where ``provider`` is name of storage. "
@@ -1455,7 +1446,7 @@ msgstr ""
 "storages.readthedocs.io/en/latest/backends/apache_libcloud.html#libcloud-"
 "providers>`_."
 
-#: ../../config.rst:493
+#: ../../config.rst:492
 msgid ""
 "This setting is required to configure connections to cloud storage "
 "providers. Each entry corresponds to a single ‘bucket’ of storage. You "
@@ -1468,7 +1459,7 @@ msgstr ""
 "(например, несколько buckets S3), и вы можете определить buckets в "
 "нескольких провайдерах."
 
-#: ../../config.rst:498
+#: ../../config.rst:497
 msgid ""
 "For ``Boto3`` all settings grouped by section named ``[storages.boto3]``."
 " Section must contain following keys: ``access_key_id``, "
@@ -1483,7 +1474,7 @@ msgstr ""
 "amazon-S3 <https://django-"
 "storages.readthedocs.io/en/latest/backends/amazon-S3.html>`_."
 
-#: ../../config.rst:503
+#: ../../config.rst:502
 msgid ""
 "Storage has following priority to choose storage engine if multiple was "
 "provided:"
@@ -1491,19 +1482,19 @@ msgstr ""
 "При выборе движка хранилища используется следующий приоритет, если их "
 "было предоставлено несколько:"
 
-#: ../../config.rst:505
+#: ../../config.rst:504
 msgid "Libcloud store when config contains this section."
 msgstr "Хранилище Libcloud, когда конфигурация содержит этот раздел."
 
-#: ../../config.rst:507
+#: ../../config.rst:506
 msgid "Boto3 store, when you have section and has all required keys."
 msgstr "Хранилище Boto3, когда у вас есть раздел и имеются все необходимые ключи."
 
-#: ../../config.rst:509
+#: ../../config.rst:508
 msgid "FileSystem store otherwise."
 msgstr "В противном случае хранилище FileSystem."
 
-#: ../../config.rst:511
+#: ../../config.rst:510
 msgid ""
 "Once you have defined your Libcloud providers, you have an option of "
 "setting one provider as the default provider of Libcloud storage. You can"
@@ -1516,7 +1507,7 @@ msgstr ""
 "``[storages.libcloud.default]`` или же vstutils установит первое "
 "хранилище, как хранилище по умолчанию."
 
-#: ../../config.rst:516
+#: ../../config.rst:515
 msgid ""
 "If you configure default libcloud provider, vstutils will use it as "
 "global file storage. To override it set "
@@ -1537,7 +1528,7 @@ msgstr ""
 "``default=storages.backends.apache_libcloud.LibCloudStorage`` в разделе "
 "``[storages]`` и используйте провайдера Libcloud, как по умолчанию."
 
-#: ../../config.rst:524
+#: ../../config.rst:523
 msgid ""
 "Here is example for boto3 connection to minio cluster with public read "
 "permissions, external proxy domain and internal connection support:"
@@ -1545,15 +1536,15 @@ msgstr ""
 "Вот пример подключения boto3 к кластеру minio с публичными правами на "
 "чтение, внешним доменом прокси и поддержкой внутреннего подключения:"
 
-#: ../../config.rst:553
+#: ../../config.rst:552
 msgid "Throttle settings"
 msgstr "Настройки Throttle"
 
-#: ../../config.rst:555
+#: ../../config.rst:554
 msgid "Section ``[throttle]``."
 msgstr "Раздел ``[throttle]``."
 
-#: ../../config.rst:557
+#: ../../config.rst:556
 msgid ""
 "By including this section to your config, you can setup global and per-"
 "view throttle rates. Global throttle rates are specified under root "
@@ -1566,13 +1557,13 @@ msgstr ""
 "индивидуальные throttle rates для конкретного View, вам нужно добавить "
 "дочернюю секцию."
 
-#: ../../config.rst:561
+#: ../../config.rst:560
 msgid "For example, if you want to apply throttle to ``api/v1/author``:"
 msgstr ""
 "Например, если вы хотите применить ограничение количества запросов для "
 "``api/v1/author``:"
 
-#: ../../config.rst:569
+#: ../../config.rst:568
 msgid ""
 "**rate** - Throttle rate in format number_of_requests/time_period. "
 "Expected time_periods: second/minute/hour/day."
@@ -1581,7 +1572,7 @@ msgstr ""
 "number_of_requests/time_period. Expected time_periods: "
 "second/minute/hour/day."
 
-#: ../../config.rst:570
+#: ../../config.rst:569
 msgid ""
 "**actions** - Comma separated list of drf actions. Throttle will be "
 "applied only on specified here actions. Default: update, partial_update."
@@ -1590,7 +1581,7 @@ msgstr ""
 "количества запросов будет применяться только к указанным здесь действиям."
 " По умолчанию: update, partial_update."
 
-#: ../../config.rst:572
+#: ../../config.rst:571
 msgid ""
 "More on throttling at `DRF Throttle docs <https://www.django-rest-"
 "framework.org/api-guide/throttling/>`_."
@@ -1598,15 +1589,15 @@ msgstr ""
 "Подробнее об ограничении количества запросов в `документации DRF Throttle"
 " <https://www.django-rest-framework.org/api-guide/throttling/>`_."
 
-#: ../../config.rst:578
+#: ../../config.rst:577
 msgid "Web Push settings"
 msgstr "Настройки веб-уведомлений"
 
-#: ../../config.rst:580
+#: ../../config.rst:579
 msgid "Section ``[webpuwsh]``."
 msgstr "Раздел ``[webpuwsh]``."
 
-#: ../../config.rst:582
+#: ../../config.rst:581
 msgid ""
 "**enabled**: A boolean flag that enables or disables web push "
 "notifications. Set to `true` to activate web push notifications, and "
@@ -1621,7 +1612,7 @@ msgstr ""
 "пользователя будут скрыты, и метод `send` класса уведомлений ничего не "
 "будет делать."
 
-#: ../../config.rst:584
+#: ../../config.rst:583
 msgid ""
 "**vapid_private_key**, **vapid_public_key**: These are the application "
 "server keys used for sending push notifications. The VAPID (Voluntary "
@@ -1642,7 +1633,7 @@ msgstr ""
 "notifications-"
 "subscribing-a-user#how_to_create_application_server_keys>`_."
 
-#: ../../config.rst:586
+#: ../../config.rst:585
 msgid ""
 "**vapid_admin_email**: This setting specifies the email address of the "
 "administrator or the person responsible for the server. It is a contact "
@@ -1654,7 +1645,7 @@ msgstr ""
 "службы push, чтобы связаться в случае каких-либо проблем или нарушений "
 "политики."
 
-#: ../../config.rst:588
+#: ../../config.rst:587
 msgid ""
 "**default_notification_icon**: URL of the default icon image to be used "
 "for web push notifications, to avoid confusion absolute URL is preferred."
@@ -1671,7 +1662,7 @@ msgstr ""
 "<https://web.dev/articles/push-notifications-"
 "display-a-notification#icon>`_."
 
-#: ../../config.rst:590
+#: ../../config.rst:589
 msgid ""
 "For more detailed guidance on using and implementing web push "
 "notifications in VSTUtils, refer to the Web Push manual provided "
@@ -1681,7 +1672,7 @@ msgstr ""
 "веб-уведомлений в VSTUtils смотрите руководство по веб-уведомлениям, "
 ":ref:`here<webpush-manual>`."
 
-#: ../../config.rst:592
+#: ../../config.rst:591
 msgid ""
 "Remember, these settings are crucial for the proper functioning and "
 "reliability of web push notifications in your application. Ensure that "
@@ -1691,87 +1682,86 @@ msgstr ""
 "надежности веб-уведомлений в вашем приложении. Убедитесь, что они "
 "настроены правильно для оптимальной производительности."
 
-#: ../../config.rst:596
+#: ../../config.rst:595
 msgid "OAuth 2 settings"
 msgstr "Настройки OAuth 2"
 
-#: ../../config.rst:598
+#: ../../config.rst:597
 msgid "Section ``[oauth]``."
 msgstr "Раздел ``[oauth]``."
 
-#: ../../config.rst:602
+#: ../../config.rst:599 ../../config.rst:604
+msgid "For custom OAuth2 server use the following settings:"
+msgstr "Для пользовательского сервера OAuth2 используйте следующие настройки:"
+
+#: ../../config.rst:601
 msgid "**server_url**: URL of OAuth2 server."
 msgstr "**server_url**: URL сервера OAuth2."
 
-#: ../../config.rst:603
+#: ../../config.rst:602
 msgid ""
 "**server_token_endpoint_path**: Path of OAuth2 server token endpoint "
 "(used in swagger schema). If not provided, `/{API_URL}/oauth2/token/` "
 "will be used instead."
 msgstr ""
-"**server_token_endpoint_path**: Путь к конечной точке выдачи токенов сервера OAuth2 "
-"(используется в схеме swagger). Если не указано, будет использоваться `/{API_URL}/oauth2/token/`."
-
-#: ../../config.rst:596
-msgid "OAuth 2 settings"
-msgstr "Настройки OAuth 2"
+"**server_token_endpoint_path**: Путь к конечной точке выдачи токенов "
+"сервера OAuth2 (используется в схеме swagger). Если не указано, будет "
+"использоваться `/{API_URL}/oauth2/token/`."
 
-#: ../../config.rst:598
-msgid "Section ``[oauth]``."
-msgstr "Раздел ``[oauth]``."
-
-#: ../../config.rst:600 ../../config.rst:605
-msgid "For custom OAuth2 server use the following settings:"
-msgstr "Для пользовательского сервера OAuth2 используйте следующие настройки:"
-
-#: ../../config.rst:607
+#: ../../config.rst:606
 msgid "**server_enable**: Enable or disable OAuth2 server. Default: `True`."
-msgstr "**server_enable**: Включить или отключить сервер OAuth2. По умолчанию: `True`."
+msgstr ""
+"**server_enable**: Включить или отключить сервер OAuth2. По умолчанию: "
+"`True`."
 
-#: ../../config.rst:608
+#: ../../config.rst:607
 msgid "**server_issuer**: Issuer for JWT tokens. Must be provided."
 msgstr "**server_issuer**: Эмитент для JWT токенов. Должен быть указан."
 
-#: ../../config.rst:609
+#: ../../config.rst:608
 msgid ""
 "**server_jwt_key**: JWT key. Octet sequence (used to represent symmetric "
 "keys). Must be provided."
 msgstr ""
-"**server_jwt_key**: Ключ JWT. Последовательность октетов (используется для представления симметричных "
-"ключей). Должен быть указан."
+"**server_jwt_key**: Ключ JWT. Последовательность октетов (используется "
+"для представления симметричных ключей). Должен быть указан."
 
-#: ../../config.rst:610
+#: ../../config.rst:609
 msgid "**server_jwt_alg**: JWT algorithm. Default: `HS256`."
 msgstr "**server_jwt_alg**: Алгоритм JWT. По умолчанию: `HS256`."
 
-#: ../../config.rst:611
+#: ../../config.rst:610
 msgid ""
 "**server_class**: Import path to OAuth2 server class. See `authlib docs "
 "<https://docs.authlib.org/en/latest/specs/rfc6749.html#authlib.oauth2.rfc6749.AuthorizationServer>`_"
 " for more information. Default: "
 "`vstutils.oauth2.authorization_server.AuthorizationServer`."
 msgstr ""
-"**server_class**: Путь импорта к классу сервера OAuth2. См. `документацию authlib "
-"<https://docs.authlib.org/en/latest/specs/rfc6749.html#authlib.oauth2.rfc6749.AuthorizationServer>`_ "
-"для получения дополнительной информации. По умолчанию: "
+"**server_class**: Путь импорта к классу сервера OAuth2. См. `документацию"
+" authlib "
+"<https://docs.authlib.org/en/latest/specs/rfc6749.html#authlib.oauth2.rfc6749.AuthorizationServer>`_"
+" для получения дополнительной информации. По умолчанию: "
 "`vstutils.oauth2.authorization_server.AuthorizationServer`."
 
-#: ../../config.rst:612
+#: ../../config.rst:611
 msgid ""
 "**server_enable_anon_login**: Enable or disable anonymous login using "
 "empty strings as username and password. Default: `False`."
 msgstr ""
-"**server_enable_anon_login**: Включить или отключить анонимный вход, используя "
-"пустые строки в качестве имени пользователя и пароля. По умолчанию: `False`."
-#: ../../config.rst:613
+"**server_enable_anon_login**: Включить или отключить анонимный вход, "
+"используя пустые строки в качестве имени пользователя и пароля. По "
+"умолчанию: `False`."
+
+#: ../../config.rst:612
 msgid ""
 "**server_jwt_extra_claims_provider**: Import path to function that "
 "receives user and returns extra claims for JWT token. Default: `None`."
 msgstr ""
 "**server_jwt_extra_claims_provider**: Путь импорта к функции, которая "
-"принимает пользователя и возвращает дополнительные утверждения для JWT токена. По умолчанию: `None`."
+"принимает пользователя и возвращает дополнительные утверждения для JWT "
+"токена. По умолчанию: `None`."
 
-#: ../../config.rst:614
+#: ../../config.rst:613
 msgid ""
 "**server_allow_insecure**: If enabled then server will allow HTTP "
 "requests. Default: `False`."
@@ -1779,57 +1769,59 @@ msgstr ""
 "**server_allow_insecure**: Если включено, сервер будет разрешать HTTP "
 "запросы. По умолчанию: `False`."
 
-#: ../../config.rst:615
+#: ../../config.rst:614
 msgid ""
 "**server_token_expires_in**: Token expiration time in seconds. Duration "
 "values can be used, for example `3d2h32m`. Default: `864000`."
 msgstr ""
-"**server_token_expires_in**: Время истечения токена в секундах. Можно использовать "
-"значения продолжительности, например `3d2h32m`. По умолчанию: `864000`."
+"**server_token_expires_in**: Время истечения токена в секундах. Можно "
+"использовать значения продолжительности, например `3d2h32m`. По "
+"умолчанию: `864000`."
 
-#: ../../config.rst:616
+#: ../../config.rst:615
 msgid ""
 "**server_client_authentication_methods**: List of client authentication "
 "methods. Default server supports following values `'client_secret_basic',"
 " 'client_secret_post', 'none'`. Default: `['client_secret_basic', "
 "'client_secret_post']`."
 msgstr ""
-"**server_client_authentication_methods**: Список методов аутентификации клиента. "
-"Сервер по умолчанию поддерживает следующие значения `'client_secret_basic', "
-"'client_secret_post', 'none'`. По умолчанию: `['client_secret_basic', "
-"'client_secret_post']`."
+"**server_client_authentication_methods**: Список методов аутентификации "
+"клиента. Сервер по умолчанию поддерживает следующие значения "
+"`'client_secret_basic', 'client_secret_post', 'none'`. По умолчанию: "
+"`['client_secret_basic', 'client_secret_post']`."
 
-#: ../../config.rst:617
+#: ../../config.rst:616
 msgid ""
 "**server_authorization_endpoint**: Url of OAuth 2 Authorization endpoint."
 " Will appear in output of `/.well-known/oauth-authorization-server` and "
 "`/.well-known/openid-configuration` discovery endpoints."
 msgstr ""
-"**server_authorization_endpoint**: URL конечной точки авторизации OAuth 2. "
-"Появится в выводе `/.well-known/oauth-authorization-server` и "
-"`/.well-known/openid-configuration` точек обнаружения."
+"**server_authorization_endpoint**: URL конечной точки авторизации OAuth "
+"2. Появится в выводе `/.well-known/oauth-authorization-server` и `/.well-"
+"known/openid-configuration` точек обнаружения."
 
-#: ../../config.rst:619
+#: ../../config.rst:618
 msgid ""
 "By default one client can be configured using **server_simple_client_id**"
 " and **server_simple_client_secret**. Any other clients can be configured"
 " using **OAUTH_SERVER_CLIENTS** dictionary in `settings.py` where key is "
 "`client_id` and value is `client_secret`."
 msgstr ""
-"По умолчанию один клиент может быть настроен с использованием **server_simple_client_id** "
-"и **server_simple_client_secret**. Любые другие клиенты могут быть настроены "
-"с использованием словаря **OAUTH_SERVER_CLIENTS** в `settings.py`, где ключ - это "
-"`client_id`, а значение - `client_secret`."
+"По умолчанию один клиент может быть настроен с использованием "
+"**server_simple_client_id** и **server_simple_client_secret**. Любые "
+"другие клиенты могут быть настроены с использованием словаря "
+"**OAUTH_SERVER_CLIENTS** в `settings.py`, где ключ - это `client_id`, а "
+"значение - `client_secret`."
 
-#: ../../config.rst:623
+#: ../../config.rst:622
 msgid "Production web settings"
 msgstr "Настройки для продакшн-сервера"
 
-#: ../../config.rst:625
+#: ../../config.rst:624
 msgid "Section ``[uwsgi]``."
 msgstr "Раздел ``[uwsgi]``."
 
-#: ../../config.rst:627
+#: ../../config.rst:626
 msgid ""
 "Settings related to web-server used by vstutils-based application in "
 "production (for deb and rpm packages by default). Most of them related to"
@@ -1842,7 +1834,7 @@ msgstr ""
 "т. д.). Дополнительные настройки смотрите в `документации uWSGI. <http"
 "://uwsgi-docs.readthedocs.io/en/latest/Configuration.html>`_."
 
-#: ../../config.rst:633
+#: ../../config.rst:632
 msgid ""
 "But keep in mind that uWSGI is deprecated and may be removed in future "
 "releases. Use the uvicorn settings to manage your app server."
@@ -1851,15 +1843,15 @@ msgstr ""
 "версиях. Используйте настройки uvicorn для управления сервером вашего "
 "приложения."
 
-#: ../../config.rst:638
+#: ../../config.rst:637
 msgid "Working behind the proxy server with TLS"
 msgstr "Работа за прокси-сервером с поддержкой TLS"
 
-#: ../../config.rst:641
+#: ../../config.rst:640
 msgid "Nginx"
 msgstr "Nginx"
 
-#: ../../config.rst:643
+#: ../../config.rst:642
 msgid ""
 "To configure vstutils for operation behind Nginx with TLS, follow these "
 "steps:"
@@ -1867,11 +1859,11 @@ msgstr ""
 "Чтобы настроить vstutils для работы через Nginx с поддержкой TLS, "
 "выполните следующие шаги:"
 
-#: ../../config.rst:645
+#: ../../config.rst:644
 msgid "**Install Nginx:**"
 msgstr "**Установка Nginx:**"
 
-#: ../../config.rst:647
+#: ../../config.rst:646
 msgid ""
 "Ensure that Nginx is installed on your server. You can install it using "
 "the package manager specific to your operating system."
@@ -1880,11 +1872,11 @@ msgstr ""
 "его с помощью менеджера пакетов, специфичного для вашей операционной "
 "системы."
 
-#: ../../config.rst:649
+#: ../../config.rst:648
 msgid "**Configure Nginx:**"
 msgstr "**Настройка Nginx:**"
 
-#: ../../config.rst:651
+#: ../../config.rst:650
 msgid ""
 "Create an Nginx configuration file for your vstutils application. Below "
 "is a basic example of an Nginx configuration. Adjust the values based on "
@@ -1894,7 +1886,7 @@ msgstr ""
 "приведен базовый пример конфигурации Nginx. Измените значения в "
 "соответствии с вашей конкретной настройкой."
 
-#: ../../config.rst:690
+#: ../../config.rst:689
 msgid ""
 "Replace ``your_domain.com`` with your actual domain, and update the paths"
 " for SSL certificates."
@@ -1902,11 +1894,11 @@ msgstr ""
 "Замените ``your_domain.com`` на ваш реальный домен и обновите пути к "
 "SSL-сертификатам."
 
-#: ../../config.rst:692 ../../config.rst:775 ../../config.rst:827
+#: ../../config.rst:691 ../../config.rst:774 ../../config.rst:826
 msgid "**Update vstutils settings:**"
 msgstr "**Обновление настроек vstutils:**"
 
-#: ../../config.rst:694 ../../config.rst:777 ../../config.rst:829
+#: ../../config.rst:693 ../../config.rst:776 ../../config.rst:828
 msgid ""
 "Ensure that your vstutils settings have the correct configurations for "
 "HTTPS. In your ``/etc/vstutils/settings.ini`` (or project "
@@ -1916,21 +1908,21 @@ msgstr ""
 "HTTPS. В вашем ``/etc/vstutils/settings.ini`` (или в проекте "
 "``settings.ini``):"
 
-#: ../../config.rst:702
+#: ../../config.rst:701
 msgid "This ensures that vstutils recognizes the HTTPS connection."
 msgstr "Это гарантирует, что vstutils распознает соединение по протоколу HTTPS."
 
-#: ../../config.rst:704
+#: ../../config.rst:703
 msgid "**Restart Nginx:**"
 msgstr "**Перезапустите Nginx:**"
 
-#: ../../config.rst:706
+#: ../../config.rst:705
 msgid "After making these changes, restart Nginx to apply the new configurations:"
 msgstr ""
 "После внесения этих изменений перезапустите Nginx, чтобы применить новые "
 "конфигурации:"
 
-#: ../../config.rst:712
+#: ../../config.rst:711
 msgid ""
 "Now, your vstutils application should be accessible via HTTPS through "
 "Nginx. Adjust these instructions based on your specific environment and "
@@ -1940,11 +1932,11 @@ msgstr ""
 "Nginx. Измените эти инструкции в зависимости от вашего конкретного "
 "окружения и требований к безопасности."
 
-#: ../../config.rst:716
+#: ../../config.rst:715
 msgid "Traefik"
 msgstr "Traefik"
 
-#: ../../config.rst:718
+#: ../../config.rst:717
 msgid ""
 "To configure vstutils for operation behind Traefik with TLS, follow these"
 " steps:"
@@ -1952,11 +1944,11 @@ msgstr ""
 "Чтобы настроить vstutils для работы через Traefik с поддержкой TLS, "
 "выполните следующие шаги:"
 
-#: ../../config.rst:720
+#: ../../config.rst:719
 msgid "**Install Traefik:**"
 msgstr "**Установка Traefik:**"
 
-#: ../../config.rst:722
+#: ../../config.rst:721
 msgid ""
 "Ensure that Traefik is installed on your server. You can download the "
 "binary from the official website or use a package manager specific to "
@@ -1966,11 +1958,11 @@ msgstr ""
 "двоичный файл с официального сайта или использовать менеджер пакетов, "
 "специфичный для вашей операционной системы."
 
-#: ../../config.rst:724
+#: ../../config.rst:723
 msgid "**Configure Traefik:**"
 msgstr "**Настройка Traefik:**"
 
-#: ../../config.rst:726
+#: ../../config.rst:725
 msgid ""
 "Create a Traefik configuration file ``/path/to/traefik.toml``. Here's a "
 "basic example:"
@@ -1978,29 +1970,29 @@ msgstr ""
 "Создайте файл конфигурации Traefik ``/path/to/traefik.toml``. Вот базовый"
 " пример:"
 
-#: ../../config.rst:748
+#: ../../config.rst:747
 msgid "**Create Traefik Toml Configuration:**"
 msgstr "**Создайте конфигурацию Traefik Toml:**"
 
-#: ../../config.rst:750
+#: ../../config.rst:749
 msgid ""
 "Create the ``/path/to/traefik_config.toml`` file with the following "
 "content:"
 msgstr "Создайте файл ``/path/to/traefik_config.toml`` с следующим содержимым:"
 
-#: ../../config.rst:773
+#: ../../config.rst:772
 msgid "Make sure to replace ``your_domain.com`` with your actual domain."
 msgstr "Обязательно замените ``your_domain.com`` на ваш реальный домен."
 
-#: ../../config.rst:784
+#: ../../config.rst:783
 msgid "**Start Traefik:**"
 msgstr "**Запустите Traefik:**"
 
-#: ../../config.rst:786
+#: ../../config.rst:785
 msgid "Start Traefik with the following command:"
 msgstr "Запустите Traefik следующей командой:"
 
-#: ../../config.rst:792
+#: ../../config.rst:791
 msgid ""
 "Now, your vstutils application should be accessible via HTTPS through "
 "Traefik. Adjust these instructions based on your specific environment and"
@@ -2010,15 +2002,15 @@ msgstr ""
 "Traefik. Измените эти инструкции в зависимости от вашего конкретного "
 "окружения и требований."
 
-#: ../../config.rst:796
+#: ../../config.rst:795
 msgid "HAProxy"
 msgstr "HAProxy"
 
-#: ../../config.rst:798
+#: ../../config.rst:797
 msgid "**Install HAProxy:**"
 msgstr "**Установка HAProxy:**"
 
-#: ../../config.rst:800
+#: ../../config.rst:799
 msgid ""
 "Ensure that HAProxy is installed on your server. You can install it using"
 " the package manager specific to your operating system."
@@ -2027,11 +2019,11 @@ msgstr ""
 "его с помощью менеджера пакетов, специфичного для вашей операционной "
 "системы."
 
-#: ../../config.rst:802
+#: ../../config.rst:801
 msgid "**Configure HAProxy:**"
 msgstr "**Настройка HAProxy:**"
 
-#: ../../config.rst:804
+#: ../../config.rst:803
 msgid ""
 "Create an HAProxy configuration file for your vstutils application. Below"
 " is a basic example of an HAProxy configuration. Adjust the values based "
@@ -2041,7 +2033,7 @@ msgstr ""
 "базовый пример конфигурации HAProxy. Измените значения в соответствии с "
 "вашей конкретной настройкой."
 
-#: ../../config.rst:825
+#: ../../config.rst:824
 msgid ""
 "Replace ``your_domain.com`` with your actual domain and update the paths "
 "for SSL certificates."
@@ -2049,11 +2041,11 @@ msgstr ""
 "Замените ``your_domain.com`` на ваш реальный домен и обновите пути к "
 "SSL-сертификатам."
 
-#: ../../config.rst:836
+#: ../../config.rst:835
 msgid "**Restart HAProxy:**"
 msgstr "**Перезапуск HAProxy:**"
 
-#: ../../config.rst:838
+#: ../../config.rst:837
 msgid ""
 "After making these changes, restart HAProxy to apply the new "
 "configurations:"
@@ -2061,7 +2053,7 @@ msgstr ""
 "После внесения этих изменений перезапустите HAProxy, чтобы применить "
 "новые конфигурации."
 
-#: ../../config.rst:844
+#: ../../config.rst:843
 msgid ""
 "Now, your vstutils application should be accessible via HTTPS through "
 "HAProxy. Adjust these instructions based on your specific environment and"
@@ -2071,11 +2063,11 @@ msgstr ""
 "HAProxy. Измените эти инструкции в зависимости от вашего конкретного "
 "окружения и требований к безопасности."
 
-#: ../../config.rst:848
+#: ../../config.rst:847
 msgid "Configuration options"
 msgstr "Параметры конфигурации"
 
-#: ../../config.rst:850
+#: ../../config.rst:849
 msgid ""
 "This section contains additional information for configure additional "
 "elements."
@@ -2083,7 +2075,7 @@ msgstr ""
 "В этом разделе содержится дополнительная информация для настройки "
 "дополнительных элементов."
 
-#: ../../config.rst:852
+#: ../../config.rst:851
 msgid ""
 "If you need set ``https`` for your web settings, you can do it using "
 "HAProxy, Nginx, Traefik or configure it in ``settings.ini``."
@@ -2092,7 +2084,7 @@ msgstr ""
 " сделать это с помощью HAProxy, Nginx, Traefik или настроить в файле "
 "``settings.ini``."
 
-#: ../../config.rst:864
+#: ../../config.rst:863
 msgid ""
 "We strictly do not recommend running the web server from root. Use HTTP "
 "proxy to run on privileged ports."
@@ -2100,7 +2092,7 @@ msgstr ""
 "Мы настоятельно не рекомендуем запускать веб-сервер от имени root. "
 "Используйте HTTP-прокси, чтобы работать на привилегированных портах."
 
-#: ../../config.rst:866
+#: ../../config.rst:865
 msgid ""
 "You can use `{ENV[HOME:-value]}` (where `HOME` is environment variable, "
 "`value` is default value) in configuration values."
@@ -2108,7 +2100,7 @@ msgstr ""
 "Вы можете использовать `{ENV[HOME:-value]}` (где `HOME` - переменная "
 "окружения, `value` - значение по умолчанию) в значениях конфигурации."
 
-#: ../../config.rst:869
+#: ../../config.rst:868
 msgid ""
 "You can use environment variables for setup important settings. But "
 "config variables has more priority then env. Available settings are: "
@@ -2121,7 +2113,7 @@ msgstr ""
 "``DJANGO_LOG_LEVEL``, ``TIMEZONE`` и некоторые настройки с префиксом "
 "``[ENV_NAME]``."
 
-#: ../../config.rst:872
+#: ../../config.rst:871
 msgid ""
 "For project without special settings and project levels named ``project``"
 " these variables will start with ``PROJECT_`` prefix. There is a list of "
@@ -2129,8 +2121,7 @@ msgid ""
 "``{ENV_NAME}_ENABLE_REGISTRATION``, ``{ENV_NAME}_MAX_TFA_ATTEMPTS``, "
 "``{ENV_NAME}_ETAG_TIMEOUT``, ``{ENV_NAME}_SEND_CONFIRMATION_EMAIL``, "
 "``{ENV_NAME}_SEND_EMAIL_RETRIES``, ``{ENV_NAME}_SEND_EMAIL_RETRY_DELAY``,"
-" ``{ENV_NAME}_AUTHENTICATE_AFTER_REGISTRATION``, "
-"``{ENV_NAME}_MEDIA_ROOT`` (dir with uploads), "
+" ``{ENV_NAME}_MEDIA_ROOT`` (dir with uploads), "
 "``{ENV_NAME}_GLOBAL_THROTTLE_RATE``, and "
 "``{ENV_NAME}_GLOBAL_THROTTLE_ACTIONS``."
 msgstr ""
@@ -2140,12 +2131,11 @@ msgstr ""
 "``{ENV_NAME}_ENABLE_REGISTRATION``, ``{ENV_NAME}_MAX_TFA_ATTEMPTS``, "
 "``{ENV_NAME}_ETAG_TIMEOUT``, ``{ENV_NAME}_SEND_CONFIRMATION_EMAIL``, "
 "``{ENV_NAME}_SEND_EMAIL_RETRIES``, ``{ENV_NAME}_SEND_EMAIL_RETRY_DELAY``,"
-" ``{ENV_NAME}_AUTHENTICATE_AFTER_REGISTRATION``, "
 "``{ENV_NAME}_MEDIA_ROOT`` (директория с загрузками), "
 "``{ENV_NAME}_GLOBAL_THROTTLE_RATE``, и "
 "``{ENV_NAME}_GLOBAL_THROTTLE_ACTIONS``."
 
-#: ../../config.rst:879
+#: ../../config.rst:878
 msgid ""
 "There are also URI-specific variables for connecting to various services "
 "such as databases and caches. There are ``DATABASE_URL``, ``CACHE_URL``, "
@@ -2159,7 +2149,7 @@ msgstr ""
 "``SESSIONS_CACHE_URL`` и ``ETAG_CACHE_URL``. Как видно из названий, они "
 "тесно связаны с ключами и именами соответствующих секций конфигурации."
 
-#: ../../config.rst:883
+#: ../../config.rst:882
 msgid ""
 "We recommend to install ``uvloop`` to your environment and setup ``loop ="
 " uvloop`` in ``[uvicorn]`` section for performance reasons."
@@ -2167,7 +2157,7 @@ msgstr ""
 "Мы рекомендуем установить ``uvloop`` в ваше окружение и настроить ``loop "
 "= uvloop`` в разделе ``[uvicorn]`` для повышения производительности."
 
-#: ../../config.rst:885
+#: ../../config.rst:884
 msgid ""
 "In the context of vstutils, the adoption of ``uvloop`` is paramount for "
 "optimizing the performance of the application, especially because "
@@ -2185,7 +2175,7 @@ msgstr ""
 "библиотеки высокопроизводительного цикла событий, и специально разработан"
 " для оптимизации скорости выполнения асинхронного кода."
 
-#: ../../config.rst:889
+#: ../../config.rst:888
 msgid ""
 "By leveraging ``uvloop``, developers can achieve substantial performance "
 "improvements in terms of reduced latency and increased throughput. This "
diff --git a/pyproject.toml b/pyproject.toml
index 49ebc869..a5792f6d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=61.2", "vstcompile~=3.0"]
+requires = ["setuptools>=61.2", "vstcompile~=3.0", "cython~=3.0.10"]
 build-backend = "setuptools.build_meta"
 
 [project]
diff --git a/requirements-prod.txt b/requirements-prod.txt
index 60fcee3a..daa5fb78 100644
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -2,6 +2,6 @@
 # PyMySQL>=0.9.2,<=0.9.3; python_version<'3.0'
 # mysql-connector-python==8.0.15; python_version>'3.4'
 # Advanced cache support
-redis[hiredis]~=5.0.5
+redis[hiredis]~=5.0.7
 tarantool~=1.2.0
 pywebpush~=2.0.0
diff --git a/requirements-stubs.txt b/requirements-stubs.txt
index 826ea02a..46d6bfbd 100644
--- a/requirements-stubs.txt
+++ b/requirements-stubs.txt
@@ -6,5 +6,5 @@ django-filter-stubs~=0.1.3
 types-PyMySQL==1.1.0.1
 types-Markdown==3.5.0.3
 types-docutils==0.20.0.3
-types-aiofiles~=23.2.0.0
-typing-extensions~=4.11.0
+types-aiofiles~=24.1.0.20240626
+typing-extensions~=4.12.2
diff --git a/requirements-test.txt b/requirements-test.txt
index 7ccf63f0..b0e619e4 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,5 +1,5 @@
 # Packages needed for test
-coverage~=7.5.3
+coverage~=7.5.4
 fakeldap~=0.6.6
 tblib==3.0.0
 beautifulsoup4~=4.12.3
diff --git a/requirements.txt b/requirements.txt
index 8682e74c..5a5c447a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,7 +17,7 @@ pyuwsgi==2.0.23.post0
 # Restore it if some problems with pyuwsgi
 # uwsgi==2.0.23
 fastapi-slim~=0.111.0
-aiofiles==23.2.1
+aiofiles~=24.1.0
 asgiref>=3.8.1
 
 # Notifications
diff --git a/test_src/test_proj/models/files.py b/test_src/test_proj/models/files.py
index 295477f9..ee31884e 100644
--- a/test_src/test_proj/models/files.py
+++ b/test_src/test_proj/models/files.py
@@ -1,5 +1,7 @@
 import datetime
 import os
+
+import pydantic
 from django.db import models
 from django.db.models.functions import Now
 from rest_framework import permissions, fields as drf_fields
@@ -102,6 +104,18 @@ class List(ListModel):
     value = models.TextField()
 
 
+class ListOfFilesPydantic(pydantic.BaseModel):
+    model_config = pydantic.ConfigDict(
+        extra='ignore',
+        from_attributes=True,
+        title="TestBinaryFilesObject",
+        strict=True,
+    )
+    id: int
+    filename: str
+    test: str
+
+
 class ListOfFiles(ListModel):
     data = [
         {'id': i, 'value': 'File data', 'updated': datetime.datetime(2021, 3, 1, 16, 15, 51, 801564), 'test': 1}
@@ -115,6 +129,7 @@ class ListOfFiles(ListModel):
     class Meta:
         _view_class = (FileViewMixin, 'read_only')
         _list_fields = _detail_fields = ('id', 'filename', 'test',)
+        _extra_serializer_classes = {'serializer_class_list': ListOfFilesPydantic}
         _permission_classes = [permissions.AllowAny]
         _override_permission_classes = True
         _filterset_fields = {
diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index 94d62c28..26d8a496 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -4617,6 +4617,8 @@ def test_model_namedbinfile_field(self):
             },
             {'method': 'get', 'path': ['testbinaryfiles', instance_without_mediaType.id]},
             {'method': 'post', 'path': ['testbinaryfiles'], 'data': {'some_validatedmultiplenamedbinimage': [valid_image_content_dict]}},
+            {'method': 'get', 'path': ['testbinaryfiles', instance_without_mediaType.id, 'test_pydantic']},
+            {'method': 'get', 'path': ['testbinaryfiles', instance_without_mediaType.id, 'test_pydantic_list']},
         ]
         results = self.bulk(bulk_data)
         self.assertEqual(results[0]['status'], 201)
@@ -4676,6 +4678,9 @@ def test_model_namedbinfile_field(self):
             ''.join(results[35]['data']['some_validatedmultiplenamedbinimage'][0]),
             'Invalid image size orientations'
         )
+        self.assertEqual(results[36]['data']['id'], instance_without_mediaType.id)
+        self.assertEqual(results[37]['data']['count'], 2)
+        self.assertEqual(results[37]['data']['results'], [{'id': 1}, {'id': 2}])
 
     def test_file_field(self):
         with open(os.path.join(DIR_PATH, 'cat.jpeg'), 'rb') as cat1:
diff --git a/test_src/test_proj/views.py b/test_src/test_proj/views.py
index 1fdf14fb..0d9ae483 100644
--- a/test_src/test_proj/views.py
+++ b/test_src/test_proj/views.py
@@ -1,7 +1,9 @@
+import typing as _t
 import mimetypes
 import time
 import json
 
+import pydantic
 from django.utils.functional import SimpleLazyObject
 from rest_framework.permissions import AllowAny
 
@@ -11,7 +13,7 @@
 from vstutils.api.decorators import action, nested_view, subaction, extend_filterbackends
 from vstutils.api.serializers import DataSerializer, JsonObjectSerializer, EmptySerializer
 from vstutils.api.auth import UserViewSet
-from vstutils.api.actions import Action, SimpleFileAction
+from vstutils.api.actions import Action, SimpleAction, SimpleFileAction
 from vstutils.utils import create_view
 from vstutils.gui.context import gui_version
 
@@ -132,7 +134,24 @@ def test_err(self, request, *args, **kwargs):  # nocv
     pass
 
 
+class TestBinaryFilesPydantic(pydantic.BaseModel):
+    model_config = pydantic.ConfigDict(
+        extra='ignore',
+        from_attributes=True,
+        title="TestBinaryFilesObject",
+        strict=True,
+    )
+    id: int
+
+
 class TestBinaryFilesViewSet(ModelWithBinaryFiles.generated_view):
+    @SimpleAction(serializer_class=TestBinaryFilesPydantic)
+    def test_pydantic(self, request, *args, **kwargs):
+        return self.get_object()
+
+    @SimpleAction(serializer_class=TestBinaryFilesPydantic, is_list=True)
+    def test_pydantic_list(self, request, *args, **kwargs):
+        return self.get_queryset()
 
     @SimpleFileAction(as_attachment=True)
     def test_some_filefield_default(self, request, *args, **kwargs):
diff --git a/tox.ini b/tox.ini
index e8ad5a14..d38e77d3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,8 +33,8 @@ setenv =
     UWSGI_PROFILE = minimal
     django50: DJANGO_DEP =
     PYLINTHOME={envdir}/.pylint.d/
-    install: export BUILD_OPTIMIZATION=true
-    install: export BUILD_COMPILE=true
+    install: BUILD_OPTIMIZATION = true
+    install: BUILD_COMPILE = true
 allowlist_externals =
     rm
     ls
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 14b3fcca..da622fd3 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b14'
+__version__: str = '5.10.0b15'
diff --git a/vstutils/api/base.py b/vstutils/api/base.py
index 2a30fe3f..a84c2a58 100644
--- a/vstutils/api/base.py
+++ b/vstutils/api/base.py
@@ -12,6 +12,7 @@
 from copy import deepcopy
 
 import orjson
+import pydantic
 from django.conf import settings
 from django.core import exceptions as djexcs
 from django.http.response import Http404, FileResponse, HttpResponseNotModified
@@ -195,6 +196,30 @@ def exception_handler(exc, context):
     return default_response
 
 
+class ProxyPydanticSerializer:
+    __slots__ = ('_obj', 'schema_model', 'many', 'context')
+
+    def __init__(self, instance=None, data=None, **kwargs):
+        self.many = kwargs.pop('many', False)
+        self.context = kwargs.pop('context', None)
+        self._obj = instance
+        self.schema_model: pydantic.BaseModel = kwargs.pop('schema_model', None)
+
+    def to_representation(self, value):
+        return self.schema_model\
+            .model_validate(value, context=self.context, from_attributes=True, strict=True)\
+            .model_dump(round_trip=True, warnings=False)
+
+    @property
+    def data(self):
+        if self.many:
+            return [
+                self.to_representation(i)
+                for i in self._obj
+            ]
+        return self.to_representation(self._obj)
+
+
 class AutoSchema(DRFAutoSchema):
 
     def get_description(self, path, method):
@@ -451,6 +476,10 @@ def get_serializer(self, *args, **kwargs):
         serializer_class = self.get_serializer_class()
         if issubclass(serializer_class, BaseSerializer):
             kwargs.setdefault('context', self.get_serializer_context())
+        elif self.request.method == 'GET' and issubclass(serializer_class, pydantic.BaseModel):
+            kwargs.setdefault('context', self.get_serializer_context())
+            kwargs.setdefault('schema_model', serializer_class)
+            serializer_class = ProxyPydanticSerializer
         return serializer_class(*args, **kwargs)
 
     def nested_allow_check(self):
diff --git a/vstutils/api/base.pyi b/vstutils/api/base.pyi
index 3e32a500..9f5c6122 100644
--- a/vstutils/api/base.pyi
+++ b/vstutils/api/base.pyi
@@ -2,6 +2,9 @@ import typing as _t
 import collections
 import enum
 import logging
+
+import pydantic
+
 from . import fields as fields, responses as responses
 from ..utils import classproperty as classproperty, get_if_lazy as get_if_lazy, patch_gzip_response_decorator as patch_gzip_response_decorator, raise_context_decorator_with_default as raise_context_decorator_with_default
 from .filter_backends import get_serializer_readable_fields as get_serializer_readable_fields
@@ -52,6 +55,22 @@ def _get_cleared(qs: QuerySet) -> QuerySet: ...
 def apply_translation(obj: T, trans_function: _t.Callable[[...], _t.Text]) -> T: ...
 def exception_handler(exc: Exception, context: _t.Any) -> _t.Optional[RestResponse]: ...
 
+class ProxyPydanticSerializer:
+    __slots__ = ('_obj', 'schema_model', 'many', 'context')
+    many: bool
+    context: _t.Optional[dict]
+    schema_model: pydantic.BaseModel
+
+    def __init__(self, instance=None, data=None, **kwargs):
+        ...
+
+    def to_representation(self, value) -> dict[str, _t.Any]:
+        ...
+
+    @property
+    def data(self) -> dict[str, _t.Any]:
+        ...
+
 class AutoSchema(DRFAutoSchema): ...
 
 class QuerySetMixin(rvs.APIView):
diff --git a/vstutils/api/filter_backends.py b/vstutils/api/filter_backends.py
index d69b2d38..a72c7563 100644
--- a/vstutils/api/filter_backends.py
+++ b/vstutils/api/filter_backends.py
@@ -2,6 +2,7 @@
 import warnings
 import contextlib
 
+import pydantic
 from django.db import models
 from django.utils.encoding import force_str
 from django_filters import filters, filterset
@@ -96,7 +97,13 @@ def get_schema_operation_parameters(self, view):
 
 class OrderingFilterBackend(OrderingFilter):
     def _get_fields_for_schema(self, view):
-        for field in self.get_valid_fields(view.get_queryset(), view, {'request': view.request}):
+        serializer_class = view.get_serializer_class()
+        if issubclass(serializer_class, pydantic.BaseModel):
+            valid_fields = serializer_class.model_fields.items()
+        else:
+            valid_fields = self.get_valid_fields(view.get_queryset(), view, {'request': view.request})
+
+        for field in valid_fields:
             yield field[0]
             yield f'-{field[0]}'
 
diff --git a/vstutils/api/schema/inspectors.py b/vstutils/api/schema/inspectors.py
index 34591bb0..da071f61 100644
--- a/vstutils/api/schema/inspectors.py
+++ b/vstutils/api/schema/inspectors.py
@@ -10,7 +10,7 @@
 from rest_framework.fields import Field, JSONField, DecimalField, ListField, empty
 from rest_framework.serializers import Serializer
 
-from .. import fields, serializers, validators
+from .. import fields, serializers, validators, base as api_base
 from ...models.base import get_first_match_name
 from ...utils import raise_context_decorator_with_default
 
@@ -686,3 +686,10 @@ def field_to_swagger_object(self, field: Any, swagger_object_type: Any, use_refe
             self.handle_schema(field, result, use_references)
 
         return result
+
+
+class PydanticSerializerInspector(ReferencingSerializerInspector):
+    def field_to_swagger_object(self, field: Any, swagger_object_type: Any, use_references: Any, **kwargs: Any):
+        if isinstance(field, api_base.ProxyPydanticSerializer):
+            return openapi.Schema(**field.schema_model.model_json_schema())
+        return NotHandled
diff --git a/vstutils/api/schema/schema.py b/vstutils/api/schema/schema.py
index a70a2ca5..f0a8abce 100644
--- a/vstutils/api/schema/schema.py
+++ b/vstutils/api/schema/schema.py
@@ -175,6 +175,7 @@ class VSTAutoSchema(ExtendedSwaggerAutoSchema):
         vst_inspectors.DynamicJsonTypeFieldInspector,
         vst_inspectors.AutoCompletionFieldInspector,
         vst_inspectors.VSTFieldInspector,
+        vst_inspectors.PydanticSerializerInspector,
         vst_inspectors.VSTReferencingSerializerInspector,
         vst_inspectors.RelatedListFieldInspector,
         vst_inspectors.RatingFieldInspector,

From c511fb56b48cf98a2566999431ee19d673685929 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite@mail.ru>
Date: Thu, 11 Jul 2024 12:07:34 +1000
Subject: [PATCH 29/46] Feature(backend): Performance optimizations.

---
 .gitignore                           |   1 +
 doc/backend.rst                      |   2 +-
 doc/locale/ru/LC_MESSAGES/backend.po | 415 ++++++++++++++-------------
 pyproject.toml                       |   2 +-
 setup.py                             |  14 +-
 tox_build.ini                        |   7 +-
 vstutils/middleware.py               |  92 +++++-
 vstutils/middleware.pyi              |  12 +
 vstutils/models/cent_notify.py       |   4 +
 vstutils/models/cent_notify.pyi      |   1 +
 vstutils/session.py                  |  23 +-
 vstutils/settings.py                 |   2 +-
 vstutils/utils.py                    |   6 +
 vstutils_utils/Cargo.lock            | 302 +++++++++++++++++++
 vstutils_utils/Cargo.toml            |  15 +
 vstutils_utils/src/lib.rs            |  53 ++++
 16 files changed, 739 insertions(+), 212 deletions(-)
 create mode 100644 vstutils_utils/Cargo.lock
 create mode 100644 vstutils_utils/Cargo.toml
 create mode 100644 vstutils_utils/src/lib.rs

diff --git a/.gitignore b/.gitignore
index 0df54e43..a9ade9d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 node_modules
 vstutils/static/spa
+vstutils_utils/target
 *.pyc
 *.c
 *.so
diff --git a/doc/backend.rst b/doc/backend.rst
index 5795468d..97f4bbc4 100644
--- a/doc/backend.rst
+++ b/doc/backend.rst
@@ -163,7 +163,7 @@ The vstutils library offers a convenient request handler class for elegant OOP d
 Middleware is used to process incoming requests and send responses before they reach final destination.
 
 .. automodule:: vstutils.middleware
-    :members: BaseMiddleware
+    :members: BaseMiddleware,AsyncBaseMiddleware
 
 Filter Backends
 ~~~~~~~~~~~~~~~
diff --git a/doc/locale/ru/LC_MESSAGES/backend.po b/doc/locale/ru/LC_MESSAGES/backend.po
index 499f4402..d0ae6289 100644
--- a/doc/locale/ru/LC_MESSAGES/backend.po
+++ b/doc/locale/ru/LC_MESSAGES/backend.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VST Utils 5.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-11 22:49+0000\n"
+"POT-Creation-Date: 2024-07-10 19:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -560,6 +560,7 @@ msgstr ""
 #: vstutils.api.filters.FkFilterHandler:15
 #: vstutils.api.serializers.BaseSerializer:12
 #: vstutils.api.serializers.VSTSerializer:10
+#: vstutils.middleware.AsyncBaseMiddleware:41
 #: vstutils.middleware.BaseMiddleware:38
 #: vstutils.models.decorators.register_view_action:24
 #: vstutils.tasks.TaskClass:4 vstutils.utils.BaseEnum:4 vstutils.utils.Lock:35
@@ -686,9 +687,8 @@ msgstr "is_sliced (bool): Булево значение, указывающее,
 #: vstutils.api.actions.SimpleFileAction.pre_data
 #: vstutils.api.base.GenericViewSet.create_action_serializer
 #: vstutils.api.base.GenericViewSet.get_query_serialized_data
-#: vstutils.api.base.check_request_etag vstutils.api.base.get_etag_value
-#: vstutils.api.decorators.nested_view vstutils.api.decorators.subaction
-#: vstutils.api.endpoint.EndpointViewSet.get
+#: vstutils.api.base.get_etag_value vstutils.api.decorators.nested_view
+#: vstutils.api.decorators.subaction vstutils.api.endpoint.EndpointViewSet.get
 #: vstutils.api.endpoint.EndpointViewSet.get_client
 #: vstutils.api.endpoint.EndpointViewSet.operate
 #: vstutils.api.endpoint.EndpointViewSet.post
@@ -744,11 +744,11 @@ msgstr "is_sliced (bool): Булево значение, указывающее,
 #: vstutils.utils.ModelHandlers.get_object vstutils.utils.ObjectHandlers
 #: vstutils.utils.ObjectHandlers.backend vstutils.utils.URLHandlers
 #: vstutils.utils.URLHandlers.get_object vstutils.utils.UnhandledExecutor
-#: vstutils.utils.add_in_vary vstutils.utils.classproperty
-#: vstutils.utils.create_view vstutils.utils.decode vstutils.utils.deprecated
-#: vstutils.utils.encode vstutils.utils.get_render
-#: vstutils.utils.lazy_translate vstutils.utils.list_to_choices
-#: vstutils.utils.send_template_email
+#: vstutils.utils.add_in_vary vstutils.utils.check_request_etag
+#: vstutils.utils.classproperty vstutils.utils.create_view
+#: vstutils.utils.decode vstutils.utils.deprecated vstutils.utils.encode
+#: vstutils.utils.get_render vstutils.utils.lazy_translate
+#: vstutils.utils.list_to_choices vstutils.utils.send_template_email
 #: vstutils.utils.send_template_email_handler vstutils.utils.tmp_file
 #: vstutils.utils.tmp_file.write vstutils.utils.translate
 msgid "Parameters"
@@ -761,9 +761,8 @@ msgstr "Объект, содержащий параметры фильтраци
 #: of vstutils.api.actions.SimpleFileAction.modified_since
 #: vstutils.api.actions.SimpleFileAction.pre_data
 #: vstutils.api.base.GenericViewSet.create_action_serializer
-#: vstutils.api.base.check_request_etag vstutils.api.base.get_etag_value
-#: vstutils.api.filters.extra_filter vstutils.api.filters.name_filter
-#: vstutils.api.validators.resize_image
+#: vstutils.api.base.get_etag_value vstutils.api.filters.extra_filter
+#: vstutils.api.filters.name_filter vstutils.api.validators.resize_image
 #: vstutils.api.validators.resize_image_from_to
 #: vstutils.middleware.BaseMiddleware.handler
 #: vstutils.middleware.BaseMiddleware.request_handler
@@ -779,7 +778,8 @@ msgstr "Объект, содержащий параметры фильтраци
 #: vstutils.utils.Executor.aexecute vstutils.utils.Executor.execute
 #: vstutils.utils.Executor.write_output vstutils.utils.ModelHandlers.get_object
 #: vstutils.utils.ObjectHandlers.backend vstutils.utils.URLHandlers.get_object
-#: vstutils.utils.decode vstutils.utils.encode vstutils.utils.get_render
+#: vstutils.utils.check_request_etag vstutils.utils.decode
+#: vstutils.utils.encode vstutils.utils.get_render
 #: vstutils.utils.list_to_choices vstutils.utils.send_template_email_handler
 #: vstutils.utils.tmp_file.write
 msgid "Returns"
@@ -2619,16 +2619,23 @@ msgid ""
 msgstr ""
 "Поле, расширяющее :class:`.FileInStringField`, но скрывающее свое "
 "значение в интерфейсе администратора."
+
 #: of vstutils.api.fields.TextareaField:1
 msgid "A specialized field that allows the input and display of multiline text."
-msgstr "Специализированное поле, которое позволяет вводить и отображать многострочный текст."
+msgstr ""
+"Специализированное поле, которое позволяет вводить и отображать "
+"многострочный текст."
 
 #: of vstutils.api.fields.TextareaField:8
 msgid ""
 "Suppose you have a model with a `description` field that can contain "
 "multiline text. You can use `TextareaField` in your serializer to enable "
 "users to input and view multiline text in the GUI:"
-msgstr "Предположим, у вас есть модель с полем `description`, которое может содержать многострочный текст. Вы можете использовать `TextareaField` в вашем сериализаторе, чтобы пользователи могли вводить и просматривать многострочный текст в графическом интерфейсе:"
+msgstr ""
+"Предположим, у вас есть модель с полем `description`, которое может "
+"содержать многострочный текст. Вы можете использовать `TextareaField` в "
+"вашем сериализаторе, чтобы пользователи могли вводить и просматривать "
+"многострочный текст в графическом интерфейсе:"
 
 #: of vstutils.api.fields.UptimeField:1
 msgid ""
@@ -3570,90 +3577,6 @@ msgstr "Указывает на зависимость от сессии пол
 msgid "Indicates dependency on the user's identity."
 msgstr "Указывает на зависимость от идентичности пользователя."
 
-#: of vstutils.api.base.check_request_etag:1
-msgid ""
-"The function plays a crucial role within the context of the ETag "
-"mechanism, providing a flexible way to validate client-side ETags against"
-" the server-side version for both cache validation and ensuring data "
-"consistency in web applications. It supports conditional handling of HTTP"
-" requests based on the match or mismatch of ETag values, accommodating "
-"various scenarios such as cache freshness checks and prevention of "
-"concurrent modifications."
-msgstr ""
-"Функция играет ключевую роль в контексте механизма ETag, предоставляя "
-"гибкий способ проверки ETags на стороне клиента по сравнению с версией на"
-" стороне сервера как для проверки кэша, так и для обеспечения "
-"согласованности данных в веб-приложениях. Она поддерживает условную "
-"обработку HTTP-запросов на основе совпадения или несовпадения значений "
-"ETag, адаптируясь к различным сценариям, таким как проверки свежести кэша"
-" и предотвращение одновременных изменений."
-
-#: of vstutils.api.base.check_request_etag:8
-msgid ""
-"The HTTP request object containing the client's headers, from which the "
-"ETag for comparison is retrieved."
-msgstr ""
-"Объект HTTP-запроса, содержащий заголовки клиента, из которых извлекается"
-" ETag для сравнения."
-
-#: of vstutils.api.base.check_request_etag:12
-msgid ""
-"The server-generated ETag value that represents the current state of the "
-"resource. This unique identifier is recalculated whenever the resource's "
-"content changes."
-msgstr ""
-"ETag, сгенерированный сервером, представляет текущее состояние ресурса. "
-"Этот уникальный идентификатор пересчитывается при каждом изменении "
-"содержимого ресурса."
-
-#: of vstutils.api.base.check_request_etag:16
-msgid ""
-"Specifies the HTTP header to look for the client's ETag. Defaults to "
-"\"If-None-Match\", commonly used in GET requests for cache validation. "
-"For operations requiring confirmation that the client is acting on the "
-"latest version of a resource (e.g., PUT or DELETE), \"If-Match\" should "
-"be used instead."
-msgstr ""
-"Указывает HTTP-заголовок для поиска ETag клиента. По умолчанию "
-"используется \"If-None-Match\", обычно используемый в GET-запросах для "
-"проверки кэша. Для операций, требующих подтверждения того, что клиент "
-"действует с последней версией ресурса (например, PUT или DELETE), вместо "
-"этого следует использовать \"If-Match\"."
-
-#: of vstutils.api.base.check_request_etag:22
-msgid ""
-"A function to compare the ETags. By default, this is set to "
-"``str.__eq__``, which checks for an exact match between the client's and "
-"server's ETags, suitable for validating caches with ``If-None-Match``. To"
-" handle ``If-Match`` scenarios, where the operation should proceed only "
-"if the ETags do not match, indicating the resource has been modified, "
-"``str.__ne__`` (not equal) can be used as the operation handler. This "
-"flexibility allows for precise control over how and when clients are "
-"allowed to read from or write to resources based on their version."
-msgstr ""
-"Функция для сравнения ETags. По умолчанию установлено ``str.__eq__``, "
-"которое проверяет точное совпадение ETags клиента и сервера, подходящее "
-"для проверки кэшей с ``If-None-Match``. Для обработки сценариев ``If-"
-"Match``, когда операция должна продолжаться только в случае, если ETags "
-"не совпадают, указывая на то, что ресурс был изменен, можно использовать "
-"``str.__ne__`` (не равно) в качестве обработчика операции. Эта гибкость "
-"позволяет точно контролировать, как и когда клиентам разрешено читать или"
-" записывать ресурсы на основе их версии."
-
-#: of vstutils.api.base.check_request_etag:30
-msgid ""
-"Returns a tuple containing the server's ETag and a boolean flag. The flag"
-" is ``True`` if the operation handler condition between the server's and "
-"client's ETag is met, indicating the request should proceed based on the "
-"matching logic defined by the operation handler; otherwise, it returns "
-"``False``."
-msgstr ""
-"Возвращает кортеж, содержащий ETag сервера и булев флаг. Флаг равен "
-"``True``, если условие обработчика операции между ETag сервера и клиента "
-"выполнено, указывая на то, что запрос должен продолжаться на основе "
-"логики сопоставления, определенной обработчиком операции; в противном "
-"случае возвращает ``False``."
-
 #: of vstutils.api.base.get_etag_value:1
 msgid ""
 "The get_etag_value function is designed to compute a unique ETag value "
@@ -3759,11 +3682,95 @@ msgstr ""
 "пользовательского метода get_etag_value функция генерирует ETag на основе"
 " имени класса модели и хеша полной строки версии приложения."
 
-#: ../../backend.rst:108
+#: of vstutils.utils.check_request_etag:1
+msgid ""
+"The function plays a crucial role within the context of the ETag "
+"mechanism, providing a flexible way to validate client-side ETags against"
+" the server-side version for both cache validation and ensuring data "
+"consistency in web applications. It supports conditional handling of HTTP"
+" requests based on the match or mismatch of ETag values, accommodating "
+"various scenarios such as cache freshness checks and prevention of "
+"concurrent modifications."
+msgstr ""
+"Функция играет ключевую роль в контексте механизма ETag, предоставляя "
+"гибкий способ проверки ETags на стороне клиента по сравнению с версией на"
+" стороне сервера как для проверки кэша, так и для обеспечения "
+"согласованности данных в веб-приложениях. Она поддерживает условную "
+"обработку HTTP-запросов на основе совпадения или несовпадения значений "
+"ETag, адаптируясь к различным сценариям, таким как проверки свежести кэша"
+" и предотвращение одновременных изменений."
+
+#: of vstutils.utils.check_request_etag:8
+msgid ""
+"The HTTP request object containing the client's headers, from which the "
+"ETag for comparison is retrieved."
+msgstr ""
+"Объект HTTP-запроса, содержащий заголовки клиента, из которых извлекается"
+" ETag для сравнения."
+
+#: of vstutils.utils.check_request_etag:12
+msgid ""
+"The server-generated ETag value that represents the current state of the "
+"resource. This unique identifier is recalculated whenever the resource's "
+"content changes."
+msgstr ""
+"ETag, сгенерированный сервером, представляет текущее состояние ресурса. "
+"Этот уникальный идентификатор пересчитывается при каждом изменении "
+"содержимого ресурса."
+
+#: of vstutils.utils.check_request_etag:16
+msgid ""
+"Specifies the HTTP header to look for the client's ETag. Defaults to "
+"\"If-None-Match\", commonly used in GET requests for cache validation. "
+"For operations requiring confirmation that the client is acting on the "
+"latest version of a resource (e.g., PUT or DELETE), \"If-Match\" should "
+"be used instead."
+msgstr ""
+"Указывает HTTP-заголовок для поиска ETag клиента. По умолчанию "
+"используется \"If-None-Match\", обычно используемый в GET-запросах для "
+"проверки кэша. Для операций, требующих подтверждения того, что клиент "
+"действует с последней версией ресурса (например, PUT или DELETE), вместо "
+"этого следует использовать \"If-Match\"."
+
+#: of vstutils.utils.check_request_etag:22
+msgid ""
+"A function to compare the ETags. By default, this is set to "
+"``str.__eq__``, which checks for an exact match between the client's and "
+"server's ETags, suitable for validating caches with ``If-None-Match``. To"
+" handle ``If-Match`` scenarios, where the operation should proceed only "
+"if the ETags do not match, indicating the resource has been modified, "
+"``str.__ne__`` (not equal) can be used as the operation handler. This "
+"flexibility allows for precise control over how and when clients are "
+"allowed to read from or write to resources based on their version."
+msgstr ""
+"Функция для сравнения ETags. По умолчанию установлено ``str.__eq__``, "
+"которое проверяет точное совпадение ETags клиента и сервера, подходящее "
+"для проверки кэшей с ``If-None-Match``. Для обработки сценариев ``If-"
+"Match``, когда операция должна продолжаться только в случае, если ETags "
+"не совпадают, указывая на то, что ресурс был изменен, можно использовать "
+"``str.__ne__`` (не равно) в качестве обработчика операции. Эта гибкость "
+"позволяет точно контролировать, как и когда клиентам разрешено читать или"
+" записывать ресурсы на основе их версии."
+
+#: of vstutils.utils.check_request_etag:30
+msgid ""
+"Returns a tuple containing the server's ETag and a boolean flag. The flag"
+" is ``True`` if the operation handler condition between the server's and "
+"client's ETag is met, indicating the request should proceed based on the "
+"matching logic defined by the operation handler; otherwise, it returns "
+"``False``."
+msgstr ""
+"Возвращает кортеж, содержащий ETag сервера и булев флаг. Флаг равен "
+"``True``, если условие обработчика операции между ETag сервера и клиента "
+"выполнено, указывая на то, что запрос должен продолжаться на основе "
+"логики сопоставления, определенной обработчиком операции; в противном "
+"случае возвращает ``False``."
+
+#: ../../backend.rst:111
 msgid "Actions"
 msgstr "Actions (Действия)"
 
-#: ../../backend.rst:110
+#: ../../backend.rst:113
 msgid ""
 "Vstutils has the advanced system of working with actions. REST API works "
 "with data through verbs, which are called methods. However, to work with "
@@ -3773,7 +3780,7 @@ msgstr ""
 "данными через глаголы, которые называются методами. Однако для работы с "
 "одной или списком сущностей этих действий может быть недостаточно."
 
-#: ../../backend.rst:114
+#: ../../backend.rst:117
 msgid ""
 "To expand the set of actions, you need to create an action that will work"
 " with some aspect of the described model. For these purposes, there is a "
@@ -3788,7 +3795,7 @@ msgstr ""
 "также можно расширить с помощью схемы. Но для большего удобства в "
 "vstutils есть набор декораторов, которые позволяют избежать написания "
 
-#: ../../backend.rst:118
+#: ../../backend.rst:121
 msgid ""
 "The main philosophy for these wrappers is that the developer writes "
 "business logic without being distracted by the boilerplate code. Often, "
@@ -4033,11 +4040,11 @@ msgstr ""
 msgid "A tuple containing the file, its name, and its content type."
 msgstr "Кортеж, содержащий файл, его имя и тип содержимого."
 
-#: ../../backend.rst:127
+#: ../../backend.rst:130
 msgid "Filtersets"
 msgstr "Filterset'ы"
 
-#: ../../backend.rst:129
+#: ../../backend.rst:132
 msgid ""
 "For greater development convenience, the framework provides additional "
 "classes and functions for filtering elements by fields."
@@ -4123,11 +4130,11 @@ msgstr ""
 msgid "searching part of name."
 msgstr "часть названия для поиска."
 
-#: ../../backend.rst:137
+#: ../../backend.rst:140
 msgid "Responses"
 msgstr "Ответы (responses)"
 
-#: ../../backend.rst:139
+#: ../../backend.rst:142
 msgid ""
 "DRF provides a standard set of variables whose names correspond to the "
 "human-readable name of the HTTP code. For convenience, we have "
@@ -4139,7 +4146,7 @@ msgstr ""
 "оборачиваем их в набор классов с соответствующими именами и дополнительно"
 " обеспечиваем следующие возможности:"
 
-#: ../../backend.rst:144
+#: ../../backend.rst:147
 msgid ""
 "String responses are wrapped in json like ``{ \"detail\": \"string "
 "response\" }``."
@@ -4147,11 +4154,11 @@ msgstr ""
 "Строковые ответы оборачиваются в json, например ``{ \"detail\": \"string "
 "response\" }``."
 
-#: ../../backend.rst:145
+#: ../../backend.rst:148
 msgid "Attribute timings are kept for further processing in middleware."
 msgstr "Тайминги атрибутов сохраняются для дальнейшей обработки в middleware."
 
-#: ../../backend.rst:146
+#: ../../backend.rst:149
 msgid ""
 "Status code is set by class name (e.g. ``HTTP_200_OK`` or ``Response200``"
 " has code 200)."
@@ -4159,7 +4166,7 @@ msgstr ""
 "Код состояния задается именем класса (например ``HTTP_200_OK`` или "
 "``Response200`` имеют код 200)."
 
-#: ../../backend.rst:148
+#: ../../backend.rst:151
 msgid "All classes inherit from:"
 msgstr "Все классы наследуются от:"
 
@@ -4176,11 +4183,11 @@ msgstr "Код состояния HTTP."
 msgid "Response timings."
 msgstr "Тайминги ответов."
 
-#: ../../backend.rst:155
+#: ../../backend.rst:158
 msgid "Middleware"
 msgstr "Middleware"
 
-#: ../../backend.rst:157
+#: ../../backend.rst:160
 msgid ""
 "By default, Django `supposes "
 "<https://docs.djangoproject.com/en/4.1/topics/http/middleware/#writing-"
@@ -4198,6 +4205,33 @@ msgstr ""
 "Middleware используются для обработки входящих запросов и отправления "
 "ответов до того, как они достигнут получателя."
 
+#: of vstutils.middleware.AsyncBaseMiddleware:1
+msgid "Middleware base class for handling asynchronously:"
+msgstr "Базовый класс middleware для обработки:"
+
+#: of vstutils.middleware.AsyncBaseMiddleware:3
+msgid "Incoming requests by :meth:`.AsyncBaseMiddleware.request_handler()`;"
+msgstr "Входящие запросы от :meth:`.AsyncBaseMiddleware.request_handler()`;"
+
+#: of vstutils.middleware.AsyncBaseMiddleware:4
+msgid ""
+"Outgoing response before any calling on server by "
+":meth:`.AsyncBaseMiddleware.get_response_handler()`;"
+msgstr ""
+"Исходящий ответ перед любым обращением к серверу от "
+":meth:`.AsyncBaseMiddleware.get_response_handler()`;"
+
+#: of vstutils.middleware.AsyncBaseMiddleware:5
+msgid "Outgoing responses by :meth:`.AsyncBaseMiddleware.handler()`."
+msgstr "Исходящие ответы от :meth:`.AsyncBaseMiddleware.handler()`."
+
+#: of vstutils.middleware.AsyncBaseMiddleware:7
+#: vstutils.middleware.BaseMiddleware:7
+msgid "Middleware must be added to `MIDDLEWARE` list in settings."
+msgstr ""
+"Middleware должен быть добавлен в список `MIDDLEWARE`, находящийся в "
+"настройках."
+
 #: of vstutils.middleware.BaseMiddleware:1
 msgid "Middleware base class for handling:"
 msgstr "Базовый класс middleware для обработки:"
@@ -4218,12 +4252,6 @@ msgstr ""
 msgid "Outgoing responses by :meth:`.BaseMiddleware.handler()`."
 msgstr "Исходящие ответы от :meth:`.BaseMiddleware.handler()`."
 
-#: of vstutils.middleware.BaseMiddleware:7
-msgid "Middleware must be added to `MIDDLEWARE` list in settings."
-msgstr ""
-"Middleware должен быть добавлен в список `MIDDLEWARE`, находящийся в "
-"настройках."
-
 #: of vstutils.middleware.BaseMiddleware.get_response_handler:1
 msgid ""
 "Entrypoint for breaking or continuing request handling. This function "
@@ -4291,11 +4319,11 @@ msgstr "Handler запроса. Вызывается перед обработк
 msgid "Handled request object."
 msgstr "Обработанный объект запроса."
 
-#: ../../backend.rst:166
+#: ../../backend.rst:169
 msgid "Filter Backends"
 msgstr "Filter Backend'ы"
 
-#: ../../backend.rst:167
+#: ../../backend.rst:170
 msgid ""
 "`Filter Backends <https://www.django-rest-framework.org/api-"
 "guide/filtering/#djangofilterbackend>`_ are used to modify model "
@@ -4441,11 +4469,11 @@ msgstr ""
 "автогенерации схемы, предоставляемой REST-фреймворком, реализуя этот "
 "метод. Метод должен возвращать список OpenAPI сопоставлений схемы."
 
-#: ../../backend.rst:176
+#: ../../backend.rst:179
 msgid "Celery"
 msgstr "Celery"
 
-#: ../../backend.rst:178
+#: ../../backend.rst:181
 msgid ""
 "Celery is a distributed task queue. It's used to execute some actions "
 "asynchronously in a separate worker. For more details on Celery, check "
@@ -4464,7 +4492,7 @@ msgstr ""
 "settings>`_ в settings.ini. Также вам понадобится установить "
 "дополнительные [rpc] зависимости."
 
-#: ../../backend.rst:184
+#: ../../backend.rst:187
 msgid "Tasks"
 msgstr "Tasks"
 
@@ -4526,11 +4554,11 @@ msgstr ""
 msgid "The body of the task executed by workers."
 msgstr "Тело задачи выполняется worker'ами."
 
-#: ../../backend.rst:190
+#: ../../backend.rst:193
 msgid "Endpoint"
 msgstr "Endpoint"
 
-#: ../../backend.rst:192
+#: ../../backend.rst:195
 msgid ""
 "Endpoint view has two purposes: bulk requests execution and providing "
 "OpenAPI schema."
@@ -4538,7 +4566,7 @@ msgstr ""
 "Endpoint-view имеет две цели: выполнение bulk-запросов и предоставление "
 "схемы OpenAPI."
 
-#: ../../backend.rst:194
+#: ../../backend.rst:197
 msgid ""
 "Endpoint url is ``/{API_URL}/endpoint/``, for example value with default "
 "settings is ``/api/endpoint/``."
@@ -4546,7 +4574,7 @@ msgstr ""
 "URL endpoint'а - ``/{API_URL}/endpoint/``, например значение с "
 "настройками по умолчанию - ``/api/endpoint/``."
 
-#: ../../backend.rst:196
+#: ../../backend.rst:199
 msgid "``API_URL`` can be changed in ``settings.py``."
 msgstr "``API_URL`` может быть изменен в ``settings.py``."
 
@@ -4620,11 +4648,11 @@ msgstr "Выполнить нетранзакционный bulk-запрос"
 msgid "One operation serializer class."
 msgstr "Класс сериализатора одной операции."
 
-#: ../../backend.rst:203
+#: ../../backend.rst:206
 msgid "Bulk requests"
 msgstr "Bulk-запросы"
 
-#: ../../backend.rst:205
+#: ../../backend.rst:208
 msgid ""
 "Bulk request allows you send multiple requests to api at once, it accepts"
 " json list of operations."
@@ -4632,39 +4660,39 @@ msgstr ""
 "Bulk-запрос позволяет вам отсылать несколько запросов к api в одном. Он "
 "принимает json-список операций."
 
-#: ../../backend.rst:208
+#: ../../backend.rst:211
 msgid "Method"
 msgstr "Метод"
 
-#: ../../backend.rst:208
+#: ../../backend.rst:211
 msgid "Transactional (all operations in one transaction)"
 msgstr "Транзакционный (все операции в одной транзакции)"
 
-#: ../../backend.rst:208
+#: ../../backend.rst:211
 msgid "Synchronous (operations executed one by one in given order)"
 msgstr "Синхронный (операции выполняются одна за другой в указанном порядке)"
 
-#: ../../backend.rst:212
+#: ../../backend.rst:215
 msgid "``PUT /{API_URL}/endpoint/``"
 msgstr "``PUT /{API_URL}/endpoint/``"
 
-#: ../../backend.rst:212 ../../backend.rst:216
+#: ../../backend.rst:215 ../../backend.rst:219
 msgid "NO"
 msgstr "НЕТ"
 
-#: ../../backend.rst:212 ../../backend.rst:214
+#: ../../backend.rst:215 ../../backend.rst:217
 msgid "YES"
 msgstr "ДА"
 
-#: ../../backend.rst:214
+#: ../../backend.rst:217
 msgid "``POST /{API_URL}/endpoint/``"
 msgstr "``POST /{API_URL}/endpoint/``"
 
-#: ../../backend.rst:216
+#: ../../backend.rst:219
 msgid "``PATCH /{API_URL}/endpoint/``"
 msgstr "``PATCH /{API_URL}/endpoint/``"
 
-#: ../../backend.rst:219
+#: ../../backend.rst:222
 msgid ""
 "Parameters of one operation (required parameter marked by "
 ":superscript:`*`):"
@@ -4672,25 +4700,25 @@ msgstr ""
 "Параметры одной операции (обязательный параметр помечается "
 ":superscript:`*`):"
 
-#: ../../backend.rst:221
+#: ../../backend.rst:224
 msgid "``method``:superscript:`*` - http method of request"
 msgstr "``method``:superscript:`*` - http-метод запроса"
 
-#: ../../backend.rst:222
+#: ../../backend.rst:225
 msgid "``path``:superscript:`*` - path of request, can be ``str`` or ``list``"
 msgstr ""
 "``path``:superscript:`*` - путь запроса, может быть типа ``str`` или  "
 "``list``"
 
-#: ../../backend.rst:223
+#: ../../backend.rst:226
 msgid "``data`` - data to send"
 msgstr "``data`` - данные для отправки"
 
-#: ../../backend.rst:224
+#: ../../backend.rst:227
 msgid "``query`` - query parameters as ``str``"
 msgstr "``query`` - query-параметры типа ``str``"
 
-#: ../../backend.rst:225
+#: ../../backend.rst:228
 msgid ""
 "``let`` - string with name of variable (used for access to response "
 "result in templates)"
@@ -4698,7 +4726,7 @@ msgstr ""
 "``let`` - строка с именем переменной (используется для доступа к "
 "результату ответа в шаблонах)"
 
-#: ../../backend.rst:226
+#: ../../backend.rst:229
 msgid ""
 "``headers`` - ``dict`` with headers which will be sent (key - header's "
 "name, value - header's value string)."
@@ -4706,7 +4734,7 @@ msgstr ""
 "``headers`` - словарь с заголовками, которые будут переданы в запрос "
 "(ключ - имя заголовка, значение - строка со значением заголовка."
 
-#: ../../backend.rst:227
+#: ../../backend.rst:230
 msgid ""
 "``version`` - ``str`` with specified version of api, if not provided then"
 " ``VST_API_VERSION`` will be used"
@@ -4714,7 +4742,7 @@ msgstr ""
 "``version`` - ``str`` с указанной версией api, если не задано, то "
 "используется ``VST_API_VERSION``"
 
-#: ../../backend.rst:231
+#: ../../backend.rst:234
 msgid ""
 "In previous versions header's names must follow `CGI specification "
 "<https://www.w3.org/CGI/>`_ (e.g., ``CONTENT_TYPE``, "
@@ -4724,7 +4752,7 @@ msgstr ""
 "`спецификации CGI <https://www.w3.org/CGI/>`_ (например, "
 "``CONTENT_TYPE``, ``GATEWAY_INTERFACE``, ``HTTP_*``)."
 
-#: ../../backend.rst:235
+#: ../../backend.rst:238
 msgid ""
 "Since version 5.3 and after migrate to Django 4 names must follow HTTP "
 "specification instead of CGI."
@@ -4732,7 +4760,7 @@ msgstr ""
 "Начиная с версии 5.3 и после миграции на Django 4 имена должны "
 "соответствовать HTTP спецификации вместо CGI."
 
-#: ../../backend.rst:237
+#: ../../backend.rst:240
 msgid ""
 "In any request parameter you can insert result value of previous "
 "operations (``<<{OPERATION_NUMBER or LET_VALUE}[path][to][value]>>``), "
@@ -4742,27 +4770,27 @@ msgstr ""
 " операции (``<<{OPERATION_NUMBER or LET_VALUE}[path][to][value]>>``), "
 "например:"
 
-#: ../../backend.rst:247
+#: ../../backend.rst:250
 msgid "Result of bulk request is json list of objects for operation:"
 msgstr "Результат bulk-запроса - это список json-объектов, описывающих операцию:"
 
-#: ../../backend.rst:249
+#: ../../backend.rst:252
 msgid "``method`` - http method"
 msgstr "``method`` - http-метод"
 
-#: ../../backend.rst:250
+#: ../../backend.rst:253
 msgid "``path`` - path of request, always str"
 msgstr "``path`` - путь запроса, всегда строка"
 
-#: ../../backend.rst:251
+#: ../../backend.rst:254
 msgid "``data`` - data that needs to be sent"
 msgstr "``data`` - данные, которые нужно отправить"
 
-#: ../../backend.rst:252
+#: ../../backend.rst:255
 msgid "``status`` - response status code"
 msgstr "``status`` - код состояния ответа"
 
-#: ../../backend.rst:254
+#: ../../backend.rst:257
 msgid ""
 "Transactional bulk request returns ``502 BAG GATEWAY`` and does rollback "
 "after first failed request."
@@ -4770,7 +4798,7 @@ msgstr ""
 "Транзакционный bulk-запрос возвращает ``502 BAG GATEWAY`` и делает откат "
 "к состоянию до запроса после первого неудачного запроса."
 
-#: ../../backend.rst:257
+#: ../../backend.rst:260
 msgid ""
 "If you send non-transactional bulk request, you will get ``200`` status "
 "and must validate statuses on each operation responses."
@@ -4778,15 +4806,15 @@ msgstr ""
 "Если вы отправили нетранзакционный bulk-запрос, вы получите код 200 и "
 "должны будете проверить статус каждого ответа операции отдельно."
 
-#: ../../backend.rst:261
+#: ../../backend.rst:264
 msgid "OpenAPI schema"
 msgstr "Схема OpenAPI"
 
-#: ../../backend.rst:263
+#: ../../backend.rst:266
 msgid "Request on ``GET /{API_URL}/endpoint/`` returns Swagger UI."
 msgstr "Запрос на ``GET /{API_URL}/endpoint/`` возвращает Swagger UI."
 
-#: ../../backend.rst:265
+#: ../../backend.rst:268
 msgid ""
 "Request on ``GET /{API_URL}/endpoint/?format=openapi`` returns OpenAPI "
 "schema in json format. Also you can specify required version of schema "
@@ -4797,7 +4825,7 @@ msgstr ""
 "OpenAPI в формате json. Также вы можете указать нужную версию схемы, "
 "используя query-параметр ``version`` "
 
-#: ../../backend.rst:268
+#: ../../backend.rst:271
 msgid ""
 "To change the schema after generating and before sending to user use "
 "hooks. Define one or more function, each taking 2 named arguments:"
@@ -4806,15 +4834,15 @@ msgstr ""
 "используйте хуки. Напишите одну или несколько функций, каждая из которых "
 "принимает 2 именованных аргумента:"
 
-#: ../../backend.rst:271
+#: ../../backend.rst:274
 msgid "``request`` - user request object."
 msgstr "``request`` - объект запроса пользователя."
 
-#: ../../backend.rst:272
+#: ../../backend.rst:275
 msgid "``schema`` - ordered dict with OpenAPI schema."
 msgstr "``schema`` - ordered dict, содержащий схему OpenAPI."
 
-#: ../../backend.rst:275
+#: ../../backend.rst:278
 msgid ""
 "Sometimes hooks may raise an exception; in order to keep a chain of data "
 "modification, such exceptions are handled. The changes made to the schema"
@@ -4824,11 +4852,11 @@ msgstr ""
 "модификации данных, такие исключения обрабатываются. Изменения, сделанные"
 " в схеме перед выбросом исключения, в любом случае сохраняются."
 
-#: ../../backend.rst:284
+#: ../../backend.rst:287
 msgid "Example hook:"
 msgstr "Пример хука:"
 
-#: ../../backend.rst:286
+#: ../../backend.rst:289
 msgid ""
 "To connect hook(s) to your app add function import name to the "
 "``OPENAPI_HOOKS`` list in ``settings.py``"
@@ -4836,11 +4864,11 @@ msgstr ""
 "Чтобы присоединить хук(-и) к вашему приложению, добавьте строку импорта "
 "вашей функции в список ``OPENAPI_HOOKS`` в ``settings.py``"
 
-#: ../../backend.rst:296
+#: ../../backend.rst:299
 msgid "Testing Framework"
 msgstr "Фреймворк для тестирования"
 
-#: ../../backend.rst:298
+#: ../../backend.rst:301
 msgid ""
 "VST Utils Framework includes a helper in base test case class and "
 "improves support for making API requests. That means if you want make "
@@ -4852,11 +4880,11 @@ msgstr ""
 " что для отправления bulk-запроса на endpoint нет необходимости создавать"
 " и инициализировать test client, а можно сразу делать запрос."
 
-#: ../../backend.rst:309
+#: ../../backend.rst:312
 msgid "Creating test case"
 msgstr "Создание тест-кейса"
 
-#: ../../backend.rst:310
+#: ../../backend.rst:313
 msgid ""
 "``test.py`` module contains test case classes based on "
 ":class:`vstutils.tests.BaseTestCase`. At the moment, we officially "
@@ -4870,11 +4898,11 @@ msgstr ""
 "оберток запросов с проверкой выполнения и runtime-оптимизацией "
 "bulk-запросов с ручной проверкой значений."
 
-#: ../../backend.rst:317
+#: ../../backend.rst:320
 msgid "Simple example with classic tests"
 msgstr "Простой пример с классическими тестами"
 
-#: ../../backend.rst:319
+#: ../../backend.rst:322
 msgid ""
 "For example, if you have api endpoint like ``/api/v1/project/`` and model"
 " Project you can write test case like this:"
@@ -4882,7 +4910,7 @@ msgstr ""
 "Например, если у вас endpoint вида ``/api/v1/project/`` и модель Project,"
 " вы можете написать такой тест:"
 
-#: ../../backend.rst:354
+#: ../../backend.rst:357
 msgid ""
 "This example demonstrates functionality of default test case class. "
 "Default projects are initialized for the fastest and most efficient "
@@ -4896,11 +4924,11 @@ msgstr ""
 " в разные классы. В данном примере показан классический подход к "
 "тестированию, однако вы можете использовать bulk-запросы в ваших тестах."
 
-#: ../../backend.rst:362
+#: ../../backend.rst:365
 msgid "Bulk requests in tests"
 msgstr "Bulk-запросы в тестах"
 
-#: ../../backend.rst:364
+#: ../../backend.rst:367
 msgid ""
 "Bulk query system is well suited for testing and executing valid queries."
 " Previous example could be rewritten as follows:"
@@ -4908,7 +4936,7 @@ msgstr ""
 "Система bulk-запросов хорошо подходит для тестирования и запуска валидных"
 " запросов. Предыдущий пример может быть переписан так:"
 
-#: ../../backend.rst:414
+#: ../../backend.rst:417
 msgid ""
 "In this case, you have more code, but your tests are closer to GUI "
 "workflow, because vstutils-projects uses ``/api/endpoint/`` for requests."
@@ -4923,7 +4951,7 @@ msgstr ""
 " котором используется bulk меньше по сравнению с тестом, использующим "
 "стандартный механизм."
 
-#: ../../backend.rst:421
+#: ../../backend.rst:424
 msgid "Test case API"
 msgstr "API тест-кейса"
 
@@ -5281,11 +5309,11 @@ msgstr ""
 msgid "new user object for execution."
 msgstr "новый объект пользователя, от которого будет выполнение."
 
-#: ../../backend.rst:428
+#: ../../backend.rst:431
 msgid "Utils"
 msgstr "Утилиты"
 
-#: ../../backend.rst:430
+#: ../../backend.rst:433
 msgid ""
 "This is tested set of development utilities. Utilities include a "
 "collection of code that will be useful in one way or another for "
@@ -5941,11 +5969,11 @@ msgstr ""
 "Использует функцию :func:`django.utils.translation.get_language` для "
 "получения кода языка и пытается получить перевод из списка доступных."
 
-#: ../../backend.rst:442
+#: ../../backend.rst:445
 msgid "Integrating Web Push Notifications"
 msgstr "Интеграция Web Push-уведомлений"
 
-#: ../../backend.rst:444
+#: ../../backend.rst:447
 msgid ""
 "Web push notifications are an effective way to engage users with real-"
 "time messaging. To integrate web push notifications in your VSTUtils "
@@ -5955,7 +5983,7 @@ msgstr ""
 "с помощью реального времени. Чтобы интегрировать web-уведомления в ваш "
 "проект VSTUtils, выполните следующие шаги:"
 
-#: ../../backend.rst:447
+#: ../../backend.rst:450
 msgid ""
 "**Configuration**: First, include the ``vstutils.webpush`` module in the "
 "``INSTALLED_APPS`` section of your ``settings.py`` file. This enables the"
@@ -5970,7 +5998,7 @@ msgstr ""
 "настроек web-уведомлений (см. :ref:`здесь<webpush-settings>` для "
 "подробностей)."
 
-#: ../../backend.rst:450
+#: ../../backend.rst:453
 msgid ""
 "**Creating Notifications**: To create a web push notification, you need "
 "to define a class that inherits from either "
@@ -5988,19 +6016,19 @@ msgstr ""
 "``webpushes`` всех ``INSTALLED_APPS``. Ниже приведен пример, "
 "иллюстрирующий, как реализовать пользовательские классы web-уведомлений:"
 
-#: ../../backend.rst:460
+#: ../../backend.rst:463
 msgid "This example contains three classes:"
 msgstr "Этот пример содержит три класса:"
 
-#: ../../backend.rst:462
+#: ../../backend.rst:465
 msgid "`TestWebPush`: Sends notifications to all subscribed users."
 msgstr "`TestWebPush`: Отправляет уведомления всем подписанным пользователям."
 
-#: ../../backend.rst:463
+#: ../../backend.rst:466
 msgid "`TestNotification`: Targets notifications to specific users."
 msgstr "`TestNotification`: Направляет уведомления конкретным пользователям."
 
-#: ../../backend.rst:464
+#: ../../backend.rst:467
 msgid ""
 "`StaffOnlyNotification`: Restricts notifications to staff users only. "
 "Sometimes you may want to allow only some users to subscribe on specific "
@@ -6010,7 +6038,7 @@ msgstr ""
 " Иногда вы можете хотеть разрешить подписку на конкретные уведомления "
 "только некоторым пользователям."
 
-#: ../../backend.rst:466
+#: ../../backend.rst:469
 msgid ""
 "**Sending Notifications**: To dispatch a web push notification, invoke "
 "the ``send`` or ``send_in_task`` method on an instance of your web push "
@@ -6022,7 +6050,7 @@ msgstr ""
 "web-уведомления. Например, чтобы отправить уведомление с использованием "
 "`TestNotification`, вы можете сделать следующее:"
 
-#: ../../backend.rst:481
+#: ../../backend.rst:484
 msgid ""
 "The asynchronous sending of web push notifications (using methods like "
 "``send_in_task``) requires a configured Celery setup in your project, as "
@@ -6036,7 +6064,7 @@ msgstr ""
 "Убедитесь, что Celery правильно настроен и работает, чтобы использовать "
 "асинхронную отправку уведомлений."
 
-#: ../../backend.rst:486
+#: ../../backend.rst:489
 msgid ""
 "By following these steps, you can fast integrate and utilize web push "
 "notifications in projects with VSTUtils."
@@ -6044,11 +6072,11 @@ msgstr ""
 "Следуя этим шагам, вы быстро сможете интегрировать и использовать "
 "web-уведомления в проектах с VSTUtils."
 
-#: ../../backend.rst:490
+#: ../../backend.rst:493
 msgid "Troubleshooting"
 msgstr "Устранение и поиск неисправностей"
 
-#: ../../backend.rst:492
+#: ../../backend.rst:495
 msgid ""
 "Vstutils makes some errors more readable for common users and provides "
 "special error codes for administration to simplify troubleshooting."
@@ -6057,14 +6085,15 @@ msgstr ""
 "пользователей и предоставляет специальные коды ошибок для администрации, "
 "чтобы упростить поиск и устранение проблем."
 
-#: ../../backend.rst:494
+#: ../../backend.rst:497
 msgid "``VE100-VE199`` - Database related errors."
 msgstr "``VE100-VE199`` - Ошибки, связанные с базой данных."
 
-#: ../../backend.rst:495
+#: ../../backend.rst:498
 msgid ""
 "``VE100`` - Integrity error code. Used when "
 "``django.db.utils.IntegrityError`` appears."
 msgstr ""
 "``VE100`` - Код ошибки целостности. Используется при появляении "
 "``django.db.utils.IntegrityError``."
+
diff --git a/pyproject.toml b/pyproject.toml
index a5792f6d..5b9f0c62 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=61.2", "vstcompile~=3.0", "cython~=3.0.10"]
+requires = ["setuptools>=61.2", "vstcompile~=3.0", "cython~=3.0.10", "setuptools-rust~=1.9"]
 build-backend = "setuptools.build_meta"
 
 [project]
diff --git a/setup.py b/setup.py
index 20791b02..ac02253d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,10 @@
 import os
 import sys
 from vstcompile import make_setup, load_requirements
+try:
+    from setuptools_rust import RustExtension, Binding
+except ImportError:
+    RustExtension = None
 
 
 # allow setup.py to be run from any path
@@ -38,8 +42,9 @@
 kwargs = dict(
     ext_modules_list=ext_list,
     static_exclude_min=[
-        'vstutils/templates/.*\.js$',
-        'vstutils/static/bundle/.*\.js$'
+        r'vstutils/templates/.*\.js$',
+        r'vstutils/static/spa/.*\.js$'
+        r'vstutils/static/spa/.*\.css$'
     ],
     install_requires=[
         "django~=" + (os.environ.get('DJANGO_DEP', "") or "5.0.6"),
@@ -67,6 +72,11 @@
     },
 )
 
+if RustExtension is not None and os.path.exists("vstutils_utils/Cargo.toml") and os.environ.get('BUILD_OPTIMIZATION', 'false') == 'true':
+    kwargs['rust_extensions'] = [
+        RustExtension("vstutils._utils", path="vstutils_utils/Cargo.toml", binding=Binding.PyO3),
+    ]
+
 all_deps = []
 for key, deps in kwargs['extras_require'].items():
     if key not in ('stubs', 'sqs'):
diff --git a/tox_build.ini b/tox_build.ini
index 30aeb87c..72b1e2fc 100644
--- a/tox_build.ini
+++ b/tox_build.ini
@@ -28,9 +28,8 @@ deps =
     build~=1.0.3
     wheel==0.41.3
     setuptools>=61.2.0
+    setuptools-rust==1.9.0
     -rrequirements-doc.txt
-    jsmin~=3.0.0
-    csscompressor==0.9.5
     vstcompile~=3.0
 
 [testenv:auditwheel]
@@ -42,6 +41,6 @@ allowlist_externals =
     rm
     ls
 commands =
-    bash -c "for whl in `ls {toxinidir}/dist/*.whl | grep -v manylinux | grep linux`; do auditwheel repair --plat manylinux2014_x86_64 $whl -w {toxinidir}/dist/; rm $whl; done"
+    bash -c "for whl in `ls {toxinidir}/dist/*.whl | grep -v manylinux | grep linux`; do auditwheel repair --plat manylinux_2_34_x86_64 $whl -w {toxinidir}/dist/; rm $whl; done"
 deps =
-    auditwheel~=5.4.0
+    auditwheel~=6.0.0
diff --git a/vstutils/middleware.py b/vstutils/middleware.py
index 696a811f..212b3dc5 100644
--- a/vstutils/middleware.py
+++ b/vstutils/middleware.py
@@ -81,6 +81,8 @@ def handler(self, request, response):
 
     """
     __slots__ = 'get_response', 'logger'
+    sync_capable = True
+    async_capable = False
 
     def __init__(self, get_response):
         self.get_response = get_response
@@ -88,9 +90,9 @@ def __init__(self, get_response):
         super().__init__()
 
     def get_setting(self, value):
-        return self.get_django_settings(value)
+        return self.get_django_settings(value)  # nocv
 
-    def handler(self, request, response):  # nocv
+    def handler(self, request, response):
         # pylint: disable=unused-argument
 
         """
@@ -149,10 +151,84 @@ def __call__(self, request):
         )
 
 
-class TimezoneHeadersMiddleware(BaseMiddleware):
+class AsyncBaseMiddleware(BaseVstObject):
+    """
+    Middleware base class for handling asynchronously:
+
+    * Incoming requests by :meth:`.AsyncBaseMiddleware.request_handler()`;
+    * Outgoing response before any calling on server by :meth:`.AsyncBaseMiddleware.get_response_handler()`;
+    * Outgoing responses by :meth:`.AsyncBaseMiddleware.handler()`.
+
+    Middleware must be added to `MIDDLEWARE` list in settings.
+
+    Example:
+        .. sourcecode:: python
+
+            from vstutils.middleware import AsyncBaseMiddleware
+            from django.http import HttpResponse
+            import aiohttp
+
+            class CustomMiddleware(AsyncBaseMiddleware):
+                async def request_handler(self, request):
+                    # Perform an async HTTP request to get user-agent
+                    async with aiohttp.ClientSession() as session:
+                        async with session.get('http://httpbin.org/user-agent') as resp:
+                            data = await resp.json()
+                            request.headers['User-Agent'] = data['user-agent']
+                    return request
+
+                async def get_response_handler(self, request):
+                    if not request.user.is_staff:
+                        # Return 403 HTTP status for non-staff users.
+                        # This request never gets to any view.
+                        return HttpResponse(
+                            "Access denied!",
+                            content_type="text/plain",
+                            status=403
+                        )
+                    return await super().get_response_handler(request)
+
+                async def handler(self, request, response):
+                    # Perform an async HTTP request to get a custom header value
+                    async with aiohttp.ClientSession() as session:
+                        async with session.get('http://httpbin.org/headers') as resp:
+                            data = await resp.json()
+                            response['Custom-Header'] = data['headers'].get('Custom-Header', 'Some value')
+                    return response
+
+    """
+
+    __slots__ = 'get_response', 'logger'
+    sync_capable = False
+    async_capable = True
+
+    def __init__(self, get_response):
+        self.get_response = get_response
+        self.logger = logger
+        super().__init__()
+
+    def get_setting(self, value):
+        return self.get_django_settings(value)
+
+    async def handler(self, request, response):
+        return response  # nocv
+
+    async def request_handler(self, request):
+        return request
+
+    async def get_response_handler(self, request):
+        return await self.get_response(request)
+
+    async def __call__(self, request):
+        request = await self.request_handler(request)
+        response = await self.get_response_handler(request)
+        return await self.handler(request, response)
+
+
+class TimezoneHeadersMiddleware(AsyncBaseMiddleware):
     __slots__ = ()
 
-    def handler(self, request, response):
+    async def handler(self, request, response):
         response['Server-Timezone'] = self.get_setting('TIME_ZONE')
         response['VSTutils-Version'] = self.get_setting('VSTUTILS_VERSION')
         return response
@@ -234,19 +310,19 @@ def get_response_handler(self, request):
         return response
 
 
-class FrontendChangesNotifications(BaseMiddleware):
+class FrontendChangesNotifications(AsyncBaseMiddleware):
     __slots__ = ('notificator',)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.notificator = apps.get_app_config('vstutils_api').module.notificator_class([])
 
-    def request_handler(self, request):
+    async def request_handler(self, request):
         if self.notificator.is_usable():
             request.notificator = self.notificator
         return request
 
-    def handler(self, request, response):
+    async def handler(self, request, response):
         if self.notificator.is_usable():
-            request.notificator.send()
+            await self.notificator.asend()
         return response
diff --git a/vstutils/middleware.pyi b/vstutils/middleware.pyi
index e1bb5990..a72d3c77 100644
--- a/vstutils/middleware.pyi
+++ b/vstutils/middleware.pyi
@@ -31,6 +31,18 @@ class BaseMiddleware(BaseVstObject):
     def get_response_handler(self, request: HttpRequest) -> ResponseHandlerType: ...
     def __call__(self, request: HttpRequest) -> ResponseHandlerType: ...
 
+
+class AsyncBaseMiddleware(BaseVstObject):
+    logger: logging.Logger
+    get_response: GetResponseCallable
+
+    def __init__(self, get_response: GetResponseCallable) -> None: ...
+    def get_setting(self, value: _t.Text): ...
+    async def handler(self, request: HttpRequest, response: HttpResponse) -> HttpResponse: ...
+    async def request_handler(self, request: HttpRequest) -> HttpRequest: ...
+    async def get_response_handler(self, request: HttpRequest) -> ResponseHandlerType: ...
+    async def __call__(self, request: HttpRequest) -> ResponseHandlerType: ...
+
 class TimezoneHeadersMiddleware(BaseMiddleware):
     def handler(self, request: HttpRequest, response: HttpResponse) -> HttpResponse: ...
 
diff --git a/vstutils/models/cent_notify.py b/vstutils/models/cent_notify.py
index 7e4c782b..034b63c5 100644
--- a/vstutils/models/cent_notify.py
+++ b/vstutils/models/cent_notify.py
@@ -110,6 +110,10 @@ def send(self):
             logger.debug(f'Send notifications about {len(objects)} updates to channel(s) {sent_channels}.')
             return self.cent_client.send()
 
+    async def asend(self):
+        # TODO: Migrate main code here after updating to new cent package with async support.
+        return self.send()
+
     def disconnect_all(self):
         for signal in self._signals:
             self.disconnect_signal(signal)
diff --git a/vstutils/models/cent_notify.pyi b/vstutils/models/cent_notify.pyi
index 8cefb773..ea1510d6 100644
--- a/vstutils/models/cent_notify.pyi
+++ b/vstutils/models/cent_notify.pyi
@@ -43,6 +43,7 @@ class Notificator:
     def create_notification(self, labels, data) -> None: ...
     def clear_messages(self) -> None: ...
     def send(self) -> _t.Optional[list]: ...
+    async def asend(self) -> _t.Optional[list]: ...
     def disconnect_all(self) -> None: ...
     def get_subscription_channel(self, label: _t.Text) -> _t.Text: ...
     def __del__(self) -> None: ...
diff --git a/vstutils/session.py b/vstutils/session.py
index 2240a584..6b585e96 100644
--- a/vstutils/session.py
+++ b/vstutils/session.py
@@ -1,3 +1,4 @@
+import ormsgpack
 import yaml
 
 
@@ -13,7 +14,25 @@ class YamlSessionSerializer:
     __slots__ = ()
 
     def dumps(self, obj):
-        return yaml.dump(obj, Dumper=Dumper).encode('latin-1')
+        return yaml.dump(obj, Dumper=Dumper).encode('latin-1')  # nocv
 
-    def loads(self, data):
+    def loads(self, data):  # nocv
         return yaml.load(data.decode('latin-1'), Loader=Loader)  # nosec
+
+
+class MsgpackSessionSerializer:
+    __slots__ = ()
+    options = (
+        ormsgpack.OPT_SERIALIZE_PYDANTIC |
+        ormsgpack.OPT_NON_STR_KEYS |
+        ormsgpack.OPT_PASSTHROUGH_TUPLE |
+        ormsgpack.OPT_PASSTHROUGH_BIG_INT |
+        ormsgpack.OPT_PASSTHROUGH_SUBCLASS |
+        ormsgpack.OPT_PASSTHROUGH_DATETIME
+    )
+
+    def dumps(self, obj):
+        return ormsgpack.packb(obj, option=self.options)
+
+    def loads(self, data):
+        return ormsgpack.unpackb(data, option=ormsgpack.OPT_NON_STR_KEYS)
diff --git a/vstutils/settings.py b/vstutils/settings.py
index 8dec1565..4a31713a 100644
--- a/vstutils/settings.py
+++ b/vstutils/settings.py
@@ -866,7 +866,7 @@ def get_plugins():
     'DJANGO_SESSION_COOKIE_DOMAIN',
     _t.cast(_t.Any, web.get('session_cookie_domain', fallback=None))
 )
-SESSION_SERIALIZER = 'vstutils.session.YamlSessionSerializer'
+SESSION_SERIALIZER = 'vstutils.session.MsgpackSessionSerializer'
 
 CSRF_COOKIE_AGE: int = SESSION_COOKIE_AGE
 CSRF_COOKIE_DOMAIN: _t.Optional[_t.Text] = SESSION_COOKIE_DOMAIN
diff --git a/vstutils/utils.py b/vstutils/utils.py
index 5ac0684f..afc6eee0 100644
--- a/vstutils/utils.py
+++ b/vstutils/utils.py
@@ -1532,3 +1532,9 @@ def check_request_etag(request, etag_value, header_name="If-None-Match", operati
         return etag_value, True
 
     return etag_value, False
+
+
+try:
+    from ._utils import encode, decode  # noqa: F811
+except ImportError:  # nocv
+    pass
diff --git a/vstutils_utils/Cargo.lock b/vstutils_utils/Cargo.lock
new file mode 100644
index 00000000..f56244ea
--- /dev/null
+++ b/vstutils_utils/Cargo.lock
@@ -0,0 +1,302 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "indoc"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "pyo3"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8"
+dependencies = [
+ "cfg-if",
+ "indoc",
+ "libc",
+ "memoffset",
+ "parking_lot",
+ "portable-atomic",
+ "pyo3-build-config",
+ "pyo3-ffi",
+ "pyo3-macros",
+ "unindent",
+]
+
+[[package]]
+name = "pyo3-build-config"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50"
+dependencies = [
+ "once_cell",
+ "target-lexicon",
+]
+
+[[package]]
+name = "pyo3-ffi"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403"
+dependencies = [
+ "libc",
+ "pyo3-build-config",
+]
+
+[[package]]
+name = "pyo3-macros"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c"
+dependencies = [
+ "proc-macro2",
+ "pyo3-macros-backend",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pyo3-macros-backend"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "pyo3-build-config",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "syn"
+version = "2.0.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unindent"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
+
+[[package]]
+name = "vstutils_utils"
+version = "0.1.0"
+dependencies = [
+ "base64",
+ "pyo3",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
diff --git a/vstutils_utils/Cargo.toml b/vstutils_utils/Cargo.toml
new file mode 100644
index 00000000..113c65c5
--- /dev/null
+++ b/vstutils_utils/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "vstutils_utils"
+version = "0.1.0"
+edition = "2018"
+
+[dependencies]
+pyo3 = { version = "0.21.2", features = ["extension-module", "abi3"] }
+base64 = "0.22.1"
+
+[lib]
+crate-type = ["cdylib"]
+
+[profile.release]
+# Strip symbols to minimize size
+strip = true
diff --git a/vstutils_utils/src/lib.rs b/vstutils_utils/src/lib.rs
new file mode 100644
index 00000000..df84faed
--- /dev/null
+++ b/vstutils_utils/src/lib.rs
@@ -0,0 +1,53 @@
+use pyo3::prelude::*;
+use base64::{engine::general_purpose, Engine as _};
+
+/// Encode string by Vigenère cipher.
+///
+/// # Arguments
+///
+/// * `key` - Secret key for encoding.
+/// * `clear` - Clear value for encoding.
+///
+/// # Returns
+///
+/// * Encoded string.
+#[pyfunction]
+fn encode(key: &str, clear: &str) -> PyResult<String> {
+    let mut enc = Vec::with_capacity(clear.len());
+    for (i, &clear_c) in clear.as_bytes().iter().enumerate() {
+        let key_c = key.as_bytes()[i % key.len()];
+        enc.push(((clear_c as u16 + key_c as u16) % 256) as u8);
+    }
+    let encoded = general_purpose::URL_SAFE.encode(&enc);
+    Ok(encoded)
+}
+
+/// Decode string from encoded by Vigenère cipher.
+///
+/// # Arguments
+///
+/// * `key` - Secret key for decoding.
+/// * `enc` - Encoded string for decoding.
+///
+/// # Returns
+///
+/// * Decoded string.
+#[pyfunction]
+fn decode(key: &str, enc: &str) -> PyResult<String> {
+    let enc_bytes = general_purpose::URL_SAFE.decode(enc).map_err(|e| pyo3::exceptions::PyValueError::new_err(e.to_string()))?;
+    let mut dec = Vec::with_capacity(enc_bytes.len());
+    for (i, &enc_c) in enc_bytes.iter().enumerate() {
+        let key_c = key.as_bytes()[i % key.len()];
+        dec.push(((256 + enc_c as u16 - key_c as u16) % 256) as u8);
+    }
+    let decoded = String::from_utf8(dec).map_err(|e| pyo3::exceptions::PyValueError::new_err(e.to_string()))?;
+    Ok(decoded)
+}
+
+/// Define the Python module.
+#[pymodule]
+fn _utils(py: Python, m: &PyModule) -> PyResult<()> {
+    m.add_function(wrap_pyfunction!(encode, m)?)?;
+    m.add_function(wrap_pyfunction!(decode, m)?)?;
+    Ok(())
+}

From 2d963956b22eda69bcedb0b4f7f62bb56d7a33af Mon Sep 17 00:00:00 2001
From: Dmitriy Ovcharenko <ovcharenkodd@gmail.com>
Date: Mon, 15 Jul 2024 14:51:36 +1000
Subject: [PATCH 30/46] Feature(backend): Upgrade to Centrifugo 5.

---
 frontend_src/app.common.js                    |   1 -
 frontend_src/cache.ts                         | 107 -----
 frontend_src/index.ts                         |   2 +
 frontend_src/unittests/create-app.ts          |  30 +-
 frontend_src/vstutils/AppRoot.vue             |   1 -
 frontend_src/vstutils/OpenAPILoader.ts        |  35 +-
 frontend_src/vstutils/api-fetch.ts            |   5 +-
 frontend_src/vstutils/api/ApiConnector.ts     | 249 ++----------
 .../vstutils/api/TranslationsManager.ts       |  68 +---
 frontend_src/vstutils/app.ts                  |  33 +-
 .../autoupdate/AutoUpdateController.ts        |  18 +-
 .../autoupdate/ComponentWithAutoUpdate.ts     |   3 +-
 .../__tests__/AutoUpdateController.test.js    |   2 +-
 .../vstutils/autoupdate/useAutoUpdate.ts      |   3 +-
 frontend_src/vstutils/bulk.ts                 | 212 ++++++++++
 frontend_src/vstutils/cleanCacheHelpers.js    |  30 +-
 .../vstutils/default-auth-app/helpers.ts      |   6 +-
 frontend_src/vstutils/init-app.ts             | 369 ++++++++++++------
 .../querySet/__tests__/QuerySet.test.js       |  62 +--
 .../store/__tests__/detailPage.test.js        |   2 +-
 .../vstutils/store/__tests__/page.test.js     |   2 +-
 .../vstutils/store/userSettingsStore.ts       |   1 +
 package.json                                  |   2 +-
 requirements.txt                              |   2 +-
 test_src/test_proj/test_notificator.py        |   8 +-
 test_src/test_proj/test_settings.ini          |   1 -
 test_src/test_proj/tests.py                   | 104 ++---
 vstutils/__init__.py                          |   2 +-
 vstutils/api/admin.py                         |  13 -
 .../0007_delete_customtranslations.py         |  16 +
 vstutils/api/models.py                        |  21 -
 vstutils/models/cent_notify.py                |  29 +-
 vstutils/oauth2/authentication.py             |   3 +
 vstutils/session.py                           |   6 +-
 vstutils/settings.py                          |   3 -
 vstutils/utils.py                             |   2 +-
 yarn.lock                                     |  40 +-
 37 files changed, 719 insertions(+), 774 deletions(-)
 delete mode 100644 frontend_src/cache.ts
 create mode 100644 frontend_src/vstutils/bulk.ts
 create mode 100644 vstutils/api/migrations/0007_delete_customtranslations.py

diff --git a/frontend_src/app.common.js b/frontend_src/app.common.js
index a155cb30..c64712d0 100644
--- a/frontend_src/app.common.js
+++ b/frontend_src/app.common.js
@@ -68,7 +68,6 @@ import './vstutils/local-settings';
 
 export * from './vstutils/ComponentsRegistrator.js';
 export * from './vstutils/schema';
-export * from '@/cache';
 export { i18n } from './vstutils/translation';
 
 export {
diff --git a/frontend_src/cache.ts b/frontend_src/cache.ts
deleted file mode 100644
index 44a64c20..00000000
--- a/frontend_src/cache.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-export interface Cache {
-    get(key: string): Promise<string | undefined>;
-    getJson<T>(key: string): Promise<T | undefined>;
-    set(key: string, value: string): Promise<void>;
-    delete(key: string): Promise<void>;
-    clear(): Promise<void>;
-}
-
-export class DummyCache implements Cache {
-    get(key: string): Promise<string | undefined> {
-        return Promise.resolve(undefined);
-    }
-
-    getJson<T>(key: string): Promise<T | undefined> {
-        return Promise.resolve(undefined);
-    }
-
-    set(key: string, value: string): Promise<void> {
-        return Promise.resolve();
-    }
-
-    delete(key: string): Promise<void> {
-        return Promise.resolve();
-    }
-
-    clear(): Promise<void> {
-        return Promise.resolve();
-    }
-}
-
-export class StorageCache implements Cache {
-    storage: Storage;
-    prefix: string;
-
-    constructor(storage: Storage, prefix = 'cache_') {
-        this.storage = storage;
-        this.prefix = prefix;
-    }
-
-    get(key: string): Promise<string | undefined> {
-        const value = this.storage.getItem(this._getKey(key));
-        if (value === null) {
-            return Promise.resolve(undefined);
-        }
-        return Promise.resolve(value);
-    }
-
-    async getJson<T>(key: string): Promise<T | undefined> {
-        const cached = await this.get(key);
-        if (cached !== undefined) {
-            return JSON.parse(cached) as T;
-        }
-        return;
-    }
-
-    set(key: string, value: string): Promise<void> {
-        try {
-            this.storage.setItem(this._getKey(key), value);
-        } catch (error) {
-            console.warn('Can not set cache value', error);
-        }
-        return Promise.resolve();
-    }
-
-    delete(key: string): Promise<void> {
-        this.storage.removeItem(this._getKey(key));
-        return Promise.resolve();
-    }
-
-    clear(): Promise<void> {
-        const keysToRemove = [];
-        for (let i = 0; i < this.storage.length; i++) {
-            const key = this.storage.key(i);
-            if (key!.startsWith(this.prefix)) {
-                keysToRemove.push(key);
-            }
-        }
-        for (const key of keysToRemove) {
-            this.storage.removeItem(key!);
-        }
-        return Promise.resolve();
-    }
-
-    _getKey(key: string) {
-        return this.prefix + key;
-    }
-}
-
-function isLocalStorageAvailable() {
-    const test = 'test';
-    try {
-        localStorage.setItem(test, test);
-        localStorage.removeItem(test);
-        return true;
-    } catch (e) {
-        return false;
-    }
-}
-
-export function getCache(storage = window.sessionStorage): Cache {
-    if (isLocalStorageAvailable()) {
-        return new StorageCache(storage);
-    }
-    return new DummyCache();
-}
-
-export const globalCache = getCache();
diff --git a/frontend_src/index.ts b/frontend_src/index.ts
index 67cd43bb..2d89b3b1 100644
--- a/frontend_src/index.ts
+++ b/frontend_src/index.ts
@@ -15,3 +15,5 @@ export {
     onSchemaViewsCreated,
 } from './vstutils/signals';
 export { type AppSchema } from './vstutils/schema';
+export { defineFieldComponent } from './vstutils/fields/base/defineFieldComponent';
+export { BaseField } from './vstutils/fields/base/BaseField';
diff --git a/frontend_src/unittests/create-app.ts b/frontend_src/unittests/create-app.ts
index 264ffe7f..8ee70a04 100644
--- a/frontend_src/unittests/create-app.ts
+++ b/frontend_src/unittests/create-app.ts
@@ -1,7 +1,6 @@
 import { User } from 'oidc-client-ts';
 import { createLocalVue } from '@vue/test-utils';
 import VueI18n from 'vue-i18n';
-import { DummyCache } from '@/cache';
 import { type AppSchema } from '@/vstutils/schema';
 import { type InitAppConfigRaw, _createUserManager } from '@/vstutils/init-app';
 import { getApp } from '@/vstutils/utils';
@@ -29,26 +28,31 @@ export async function createApp(params?: { schema?: Partial<AppSchema>; disableB
     const config: InitAppConfigRaw = {
         el,
         vue,
-        cache: new DummyCache(),
         auth: { authorityUrl: 'https://auth.test', clientId: 'test-id', clientSecret: 'test-secret' },
         api: { url: 'http://localhost/api/', disableBulk: true },
     };
     const schema = params?.schema ?? testSchema;
 
     // Emulate previously authenticated user
-    const userManger = await _createUserManager(config, {
+    const { userManager } = await _createUserManager(config, {
         url: new URL('http://localhost/api/'),
         endpointPath: '/endpoint/',
         disableBulk: false,
     });
 
-    // @ts-expect-error Skip some properties
     const user = new User({
         access_token: 'test-access_token',
         refresh_token: 'test-refresh_token',
         token_type: 'Bearer',
+        profile: {
+            sub: '1',
+            iss: 'https://auth.test',
+            aud: ['test-id'],
+            exp: Math.round(Date.now() / 1000) + 60 * 60,
+            iat: 1,
+        },
     });
-    await userManger.storeUser(user);
+    await userManager.storeUser(user);
 
     // Start app
 
@@ -118,7 +122,7 @@ export async function createApp(params?: { schema?: Partial<AppSchema>; disableB
         if (
             request.method === 'PUT' &&
             request.url === 'http://localhost/api/endpoint/' &&
-            body === '[{"method":"GET","path":["_lang"]}]'
+            body === '[{"method":"GET","path":["_lang"]},{"method":"GET","path":["_lang","en"]}]'
         ) {
             return {
                 headers: { 'Content-Type': 'application/json' },
@@ -132,18 +136,6 @@ export async function createApp(params?: { schema?: Partial<AppSchema>; disableB
                             ],
                         },
                     },
-                ]),
-            };
-        }
-
-        if (
-            request.method === 'PUT' &&
-            request.url === 'http://localhost/api/endpoint/' &&
-            body === '[{"method":"GET","path":["_lang","en"]}]'
-        ) {
-            return {
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify([
                     {
                         status: 200,
                         data: {
@@ -175,7 +167,7 @@ export async function createApp(params?: { schema?: Partial<AppSchema>; disableB
             };
         }
 
-        throw new Error(`Unexpected request: ${request.url}`);
+        throw new Error(`Unexpected request: ${request.method} ${request.url} ${body}`);
     });
 
     await initApp(config);
diff --git a/frontend_src/vstutils/AppRoot.vue b/frontend_src/vstutils/AppRoot.vue
index 5cbfd6f3..f3ddd803 100644
--- a/frontend_src/vstutils/AppRoot.vue
+++ b/frontend_src/vstutils/AppRoot.vue
@@ -202,7 +202,6 @@
             async setLanguage(value: string) {
                 if (value && this.$i18n.locale !== value) {
                     await this.$app.setLanguage(value);
-                    await this.$app.cache.delete(window.schemaLoader.cacheKey);
                     await window.schemaLoader.loadSchema();
                 }
             },
diff --git a/frontend_src/vstutils/OpenAPILoader.ts b/frontend_src/vstutils/OpenAPILoader.ts
index c6655499..6be7ef62 100644
--- a/frontend_src/vstutils/OpenAPILoader.ts
+++ b/frontend_src/vstutils/OpenAPILoader.ts
@@ -1,49 +1,20 @@
 import { createApiFetch } from '@/vstutils/api-fetch';
 import { InitAppConfig } from './init-app';
-import { Cache } from '@/cache';
 import { type AppSchema } from './schema';
 
-/**
- * Class, that is responsible for loading of OpenAPI schema.
- * Class has methods for loading of OpenAPI schema from API as well as from cache.
- */
 export default class OpenAPILoader {
     config: InitAppConfig;
-    cacheKey: string;
-    cache: Cache;
-    anon: boolean;
 
-    constructor({ config, anon }: { config: InitAppConfig; anon?: boolean }) {
-        /**
-         * Object, that methods for manipulating with indexedDB. Instance of FilesCache.
-         */
-        this.cache = config.cache;
+    constructor({ config }: { config: InitAppConfig; anon?: boolean }) {
         this.config = config;
-        this.anon = anon ?? false;
-        this.cacheKey = anon ? 'openapi-anon' : 'openapi';
     }
 
-    async loadSchemaFromApi(): Promise<AppSchema> {
-        const apiFetch = this.anon ? fetch : createApiFetch({ config: this.config });
+    async loadSchema(): Promise<AppSchema> {
+        const apiFetch = createApiFetch({ config: this.config });
         const res = await apiFetch(new URL('endpoint/?format=openapi', this.config.api.url));
         if (!res.ok) {
             throw new Error('API request for loading of OpenAPI schema failed.');
         }
         return res.json();
     }
-
-    async loadSchema(): Promise<AppSchema> {
-        const cached = await this.cache.getJson(this.cacheKey);
-        if (cached) {
-            return cached as AppSchema;
-        }
-        try {
-            const schema = await this.loadSchemaFromApi();
-            this.cache.set(this.cacheKey, JSON.stringify(schema));
-            return schema;
-        } catch (error) {
-            console.error('Some error occurred during attempt of getting of OpenAPI schema.');
-            throw error;
-        }
-    }
 }
diff --git a/frontend_src/vstutils/api-fetch.ts b/frontend_src/vstutils/api-fetch.ts
index 060cc0f4..12a6ebeb 100644
--- a/frontend_src/vstutils/api-fetch.ts
+++ b/frontend_src/vstutils/api-fetch.ts
@@ -22,10 +22,7 @@ function addHeadersToRequest(request: Request, headers: Record<string, string>):
 function createOauth2Fetch(config: InitAppConfig, _fetch: InternalFetch): InternalFetch {
     const userManager = config.auth.userManager;
     return async (request: Request) => {
-        let user = await userManager.getUser();
-        if (!user || user.expired) {
-            user = await userManager.signinSilent();
-        }
+        const user = await userManager.getUser();
         if (!user) {
             throw new Error('User is not logged in');
         }
diff --git a/frontend_src/vstutils/api/ApiConnector.ts b/frontend_src/vstutils/api/ApiConnector.ts
index 26d38762..ec22fbe5 100644
--- a/frontend_src/vstutils/api/ApiConnector.ts
+++ b/frontend_src/vstutils/api/ApiConnector.ts
@@ -1,33 +1,22 @@
-import { BulkType, guiLocalSettings, makeQueryString } from '@/vstutils/utils';
-import { StatusError } from './StatusError';
-
 import type { AppSchema } from '@/vstutils/schema';
-import type { HttpMethod, InnerData } from '@/vstutils/utils';
+import type { BulkType, HttpMethod, InnerData } from '@/vstutils/utils';
+import { makeQueryString } from '@/vstutils/utils';
 import { createApiFetch } from '../api-fetch';
-import { type InitAppConfig } from '../init-app';
 import { type IApp } from '../app';
-
-const isNativeCacheAvailable = 'caches' in window;
-
-export interface BulkResponseHeaders {
-    'X-Query-Data'?: string;
-    'Content-Type'?: string;
-    ETag?: string;
-    [key: string]: string | undefined;
-}
-
-interface BulkResponse<D = unknown> {
-    method: HttpMethod;
-    path: string | string[];
-    data: D;
-    status: number;
-    headers: BulkResponseHeaders;
-}
+import {
+    createBulkApiFetch,
+    type BulkApiFetch,
+    type BulkResponse,
+    type BulkResponseHeaders,
+    BulkRequest as BaseBulkRequest,
+} from '../bulk';
+import { type InitAppConfig } from '../init-app';
+import { StatusError } from './StatusError';
 
 export class APIResponse<T extends BulkResponse['data'] = { detail?: string }> implements BulkResponse {
     status: number;
     data: T;
-    method: HttpMethod;
+    method: HttpMethod | Uppercase<HttpMethod>;
     path: string | string[];
     headers: BulkResponseHeaders;
 
@@ -62,7 +51,11 @@ export class APIResponse<T extends BulkResponse['data'] = { detail?: string }> i
         throw new StatusError(status, data);
     }
 
-    static async fromFetchResponse<T>(response: Response, method: HttpMethod, path: string) {
+    static async fromFetchResponse<T>(
+        response: Response,
+        method: HttpMethod | Uppercase<HttpMethod>,
+        path: string,
+    ) {
         let json = {} as T;
         try {
             json = (await response.json()) as T;
@@ -72,39 +65,6 @@ export class APIResponse<T extends BulkResponse['data'] = { detail?: string }> i
     }
 }
 
-/**
- * Reject all bulk requests with given value
- * @param {Object[]} bulks
- * @param {any=} value
- */
-function rejectAll(bulks: CollectedBulkRequest[], value: unknown) {
-    for (const bulk of bulks) {
-        bulk.callbacks.reject(value);
-    }
-}
-
-// bulk types
-
-interface RealBulkRequest {
-    method: HttpMethod;
-    path: string | (string | number)[];
-    version?: string;
-    query?: string;
-    headers?: Record<string, unknown>;
-    data?: Record<string, unknown>;
-}
-
-interface CollectedBulkRequest<T = unknown> {
-    data: RealBulkRequest;
-    promise: Promise<APIResponse<T>>;
-    callbacks: Record<string, CallableFunction>;
-}
-
-interface BulkCollector {
-    timeoutId?: ReturnType<typeof setTimeout>;
-    bulkParts: CollectedBulkRequest[];
-}
-
 // makeRequest types
 
 interface BaseRequest {
@@ -115,15 +75,13 @@ interface BaseRequest {
     headers?: Record<string, unknown>;
 }
 
-interface BulkRequest extends BaseRequest {
-    data?: Record<string, unknown>;
-}
-
 interface FetchRequest extends BaseRequest {
     data?: Record<string, unknown> | FormData;
 }
 
-type MakeRequestParamsBulk = { useBulk: true; rawResponse?: false } & BulkRequest;
+type MakeRequestParamsBulk = { useBulk: true; rawResponse?: false } & Omit<BaseBulkRequest, 'query'> & {
+        query?: string | Record<string, unknown> | URLSearchParams;
+    };
 type MakeRequestParamsFetch = { useBulk?: false; rawResponse?: false } & FetchRequest;
 type MakeRequestParamsFetchRaw = { useBulk?: false; rawResponse: true } & FetchRequest;
 
@@ -138,12 +96,10 @@ export class ApiConnector {
     defaultVersion: string | null = null;
     endpointURL: string | null = null;
     headers: Record<string, string | null | undefined>;
-    bulkCollector: BulkCollector = { bulkParts: [] };
     baseURL: string | null = null;
     disableBulk = false;
-    private _etagsCachePrefix: string | null = null;
-    private _etagsCacheName: string | null = null;
     fetch: typeof fetch = window.fetch;
+    bulk?: BulkApiFetch;
 
     /**
      * Constructor of ApiConnector class.
@@ -166,15 +122,8 @@ export class ApiConnector {
         this.openapi = app.schema;
         this.defaultVersion = this.openapi.info.version;
         this.endpointURL = String(new URL(app.config.api.endpointPath, app.config.api.url)); // TODO fetchMock does not support URL
-
         this.baseURL = new URL(app.config.api.url).toString().replace(/\/$/, '');
-
-        if (isNativeCacheAvailable) {
-            this._etagsCachePrefix = 'etags-cache';
-            // TODO full version required for cache invalidation
-            this._etagsCacheName = `${this._etagsCachePrefix}-${app.version}`;
-            void this._removeOldEtagsCaches();
-        }
+        this.bulk = createBulkApiFetch({ config: this.appConfig });
 
         this.fetch = createApiFetch({ config: app.config });
         this.disableBulk = app.config.api.disableBulk;
@@ -182,21 +131,13 @@ export class ApiConnector {
         return this;
     }
 
-    async _removeOldEtagsCaches() {
-        for (const cacheName of await window.caches.keys()) {
-            if (cacheName.startsWith(this._etagsCachePrefix!) && cacheName !== this._etagsCacheName) {
-                await window.caches.delete(cacheName);
-            }
-        }
-    }
-
     async makeRequest<T = unknown>(
         req: MakeRequestParamsBulk | MakeRequestParamsFetch,
     ): Promise<APIResponse<T>>;
     async makeRequest(req: MakeRequestParamsFetchRaw): Promise<Response>;
     async makeRequest<T = unknown>(req: MakeRequestParams): Promise<APIResponse<T> | Response> {
         if (req.useBulk && !this.disableBulk) {
-            const realBulk: RealBulkRequest = {
+            const realBulk: BaseBulkRequest = {
                 method: req.method,
                 path: req.path,
             };
@@ -250,149 +191,16 @@ export class ApiConnector {
         return `${this.baseURL!}/${this.defaultVersion!}/${path}/`;
     }
 
-    _bulkItemToRequest({ version = this.defaultVersion!, method, path, query = '', headers }: BulkRequest) {
-        path = Array.isArray(path) ? path.join('/') : path.replace(/^\/|\/$/g, '');
-        return new Request(`${this.baseURL!}/${version}/${path}/${makeQueryString(query)}`, {
-            method,
-            headers: headers as Record<string, string>,
-        });
-    }
-
-    _bulkResultItemToResponse({ data, status, headers }: BulkResponse) {
-        return new Response(JSON.stringify(data), {
-            status,
-            headers: {
-                'Content-Type': 'application/json',
-                ...headers,
-            },
-        });
-    }
-
-    async sendCachedBulk(requests: RealBulkRequest[], type = BulkType.SIMPLE) {
-        const cachedValues = new Map();
-        const cache = await window.caches.open(this._etagsCacheName!);
-        for (let i = 0; i < requests.length; i++) {
-            const item = requests[i];
-            const request = this._bulkItemToRequest(item);
-            const cached = await cache.match(request);
-            if (cached) {
-                cachedValues.set(
-                    i,
-                    cached.json().then((data) => ({
-                        status: cached.status,
-                        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                        data,
-                        headers: new Proxy(cached.headers, {
-                            get(target, name: string | symbol, receiver) {
-                                if (name in target || typeof name === 'symbol') {
-                                    return Reflect.get(target, name, receiver) as unknown;
-                                }
-                                return target.get(name);
-                            },
-                        }),
-                    })),
-                );
-                if (!item.headers) item.headers = {};
-                item.headers['If-None-Match'] = cached.headers.get('ETag');
-            }
-        }
-
-        const responses = await this.sendBulk(requests, type);
-
-        for (let i = 0; i < responses.length; i++) {
-            const response = responses[i];
-            if (response.status === 304 && cachedValues.has(i)) {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                responses[i] = await cachedValues.get(i);
-            }
-            if (response.method === 'get' && response.status < 300 && response.headers.ETag) {
-                try {
-                    void cache.put(
-                        this._bulkItemToRequest(requests[i]),
-                        this._bulkResultItemToResponse(response),
-                    );
-                } catch (e) {
-                    console.warn(e);
-                }
-            }
-        }
-
-        return responses;
+    async sendBulk<Responses = undefined>(requests: BaseBulkRequest[], type?: BulkType) {
+        return this.bulk!.raw<Responses>(requests, { type, forceAuthRequired: true });
     }
 
-    async sendBulk<Responses = undefined>(requests: RealBulkRequest[], type = BulkType.SIMPLE) {
-        const response = await this.fetch(this.endpointURL!, {
-            method: type,
-            headers: { ...this.headers, 'Content-Type': 'application/json' },
-            body: JSON.stringify(requests),
-        });
-
-        const data = (await response.json()) as unknown;
-
-        return data as Promise<
-            Responses extends unknown[]
-                ? { [Idx in keyof Responses]: BulkResponse<Responses[Idx]> }
-                : BulkResponse[]
-        >;
-    }
-
-    /**
-     * Method, that collects several bulk requests into one.
-     */
-    bulkQuery<T = Record<string, unknown>>(data: RealBulkRequest): Promise<APIResponse<T>> {
-        if (this.bulkCollector.timeoutId) {
-            clearTimeout(this.bulkCollector.timeoutId);
-        }
-
-        const callbacks: Record<string, CallableFunction> = {};
-        const promise = new Promise<APIResponse<T>>((resolve, reject) => {
-            callbacks.resolve = resolve;
-            callbacks.reject = reject;
+    bulkQuery<T = Record<string, unknown>>(data: BaseBulkRequest): Promise<APIResponse<T>> {
+        return this.bulk!<T>({ ...data, authRequired: true }).then((response) => {
+            return new APIResponse(response);
         });
-
-        this.bulkCollector.bulkParts.push({ data, promise, callbacks });
-        this.bulkCollector.timeoutId = setTimeout(
-            () => void this._sendCollectedBulks(),
-            (guiLocalSettings.get('guiApi.real_query_timeout') as number | null) ?? 100,
-        );
-
-        return promise;
     }
 
-    /**
-     * Method, that sends one big bulk request to API.
-     */
-    async _sendCollectedBulks() {
-        const bulkParts = [...this.bulkCollector.bulkParts];
-        this.bulkCollector.bulkParts = [];
-        const bulkData = bulkParts.map((bulkPart) => bulkPart.data);
-
-        try {
-            let results;
-            if (this._etagsCacheName) {
-                try {
-                    results = await this.sendCachedBulk(bulkData);
-                } catch {
-                    results = await this.sendBulk(bulkData);
-                }
-            } else {
-                results = await this.sendBulk(bulkData);
-            }
-            if (results.length < bulkParts.length) {
-                throw new Error('Responses count does not match requests count');
-            }
-            for (const [idx, item] of results.entries()) {
-                try {
-                    APIResponse.checkStatus(item.status, item.data);
-                    bulkParts[idx].callbacks.resolve(item);
-                } catch (e) {
-                    bulkParts[idx].callbacks.reject(item);
-                }
-            }
-        } catch (error) {
-            rejectAll(bulkParts, error);
-        }
-    }
     /**
      * Method returns URL of API host (server).
      */
@@ -425,6 +233,7 @@ export class ApiConnector {
         return this.makeRequest<InnerData>({
             path: ['user', 'profile'],
             method: 'get',
+            useBulk: true,
         }).then((response) => {
             return response.data;
         });
diff --git a/frontend_src/vstutils/api/TranslationsManager.ts b/frontend_src/vstutils/api/TranslationsManager.ts
index 693bc3f7..c80a2e74 100644
--- a/frontend_src/vstutils/api/TranslationsManager.ts
+++ b/frontend_src/vstutils/api/TranslationsManager.ts
@@ -1,81 +1,35 @@
-import type { Cache } from '@/cache';
 import type { LocaleMessageObject } from 'vue-i18n';
 import { type InitAppConfig } from '@/vstutils/init-app';
+import { createBulkApiFetch, type BulkApiFetch } from '@/vstutils/bulk';
 
 export interface Language {
     code: string;
     name: string;
 }
 
-/**
- * Class for requesting translations related data
- */
 export class TranslationsManager {
-    cache: Cache;
-    config: InitAppConfig;
+    bulk: BulkApiFetch;
 
     constructor(config: InitAppConfig) {
-        this.cache = config.cache;
-        this.config = config;
+        this.bulk = createBulkApiFetch({ config });
     }
 
     async loadLanguages(): Promise<Language[]> {
-        const response = await fetch(
-            new Request(new URL(this.config.api.endpointPath, this.config.api.url), {
-                method: 'PUT',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify([{ method: 'GET', path: ['_lang'] }]),
-            }),
-        );
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        const data = (await response.json())[0].data as { results: Language[] };
+        const { data } = await this.bulk<{ results: Language[] }>({
+            method: 'GET',
+            path: ['_lang'],
+        });
         return data.results;
     }
 
-    /**
-     * Method, that gets list of App languages from cache.
-     */
-    async getLanguages(): Promise<Language[]> {
-        const cached = await this.cache.getJson<Language[]>('languages');
-        if (cached) {
-            return cached;
-        }
-
-        const languages = await this.loadLanguages();
-        await this.cache.set('languages', JSON.stringify(languages));
-        return languages;
-    }
-
     /**
      * Method, that loads translations for some language from API.
      */
     async loadTranslations(lang: string): Promise<LocaleMessageObject> {
-        const response = await fetch(
-            new Request(new URL(this.config.api.endpointPath, this.config.api.url), {
-                method: 'PUT',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify([{ method: 'GET', path: ['_lang', lang] }]),
-            }),
-        );
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        const data = (await response.json())[0].data as { translations: LocaleMessageObject };
+        const { data } = await this.bulk<{ translations: LocaleMessageObject }>({
+            method: 'GET',
+            path: ['_lang', lang],
+        });
         return data.translations;
     }
-
-    /**
-     * Method, that gets translations for some language.
-     * @param {string} lang - Code of language, translations of which to load.
-     * @return {Promise.<LocaleMessageObject>}
-     */
-    async getTranslations(lang: string): Promise<LocaleMessageObject> {
-        if (this.cache) {
-            const cached = await this.cache.getJson<LocaleMessageObject>('translations.' + lang);
-            if (cached) {
-                return cached;
-            }
-        }
-        const translations = await this.loadTranslations(lang);
-        await this.cache.set('translations.' + lang, JSON.stringify(translations));
-        return translations;
-    }
 }
diff --git a/frontend_src/vstutils/app.ts b/frontend_src/vstutils/app.ts
index feae65b8..59aeb1ce 100644
--- a/frontend_src/vstutils/app.ts
+++ b/frontend_src/vstutils/app.ts
@@ -2,7 +2,7 @@ import type { ComponentOptions } from 'vue';
 import type VueRouter from 'vue-router';
 import Vue from 'vue';
 
-import Centrifuge from 'centrifuge';
+import { Centrifuge } from 'centrifuge';
 import { defineStore } from 'pinia';
 import type VueI18n from 'vue-i18n';
 
@@ -39,7 +39,6 @@ import ViewConstructor from '@/vstutils/views/ViewConstructor.js';
 import { setupPushNotifications } from '@/vstutils/webpush';
 import { type InitAppConfig } from '@/vstutils/init-app';
 
-import type { Cache } from '@/cache';
 import type { InnerData } from '@/vstutils/utils';
 import type { GlobalStoreInitialized } from '@/vstutils/store/globalStore';
 
@@ -59,7 +58,6 @@ type TAppRoot = InstanceType<typeof AppRoot>;
 export interface IApp {
     config: InitAppConfig;
     vue: typeof Vue;
-    cache: Cache;
     version: string;
     defaultPageLimit: number;
     schema: AppSchema;
@@ -131,7 +129,6 @@ interface AppParams {
 export class App implements IApp {
     config: InitAppConfig;
     vue: typeof Vue;
-    cache: Cache;
     version: string;
     defaultPageLimit: number;
     schema: AppSchema;
@@ -181,7 +178,6 @@ export class App implements IApp {
         this.vue = vue ?? Vue;
         this.schema = schema;
         this.router = null;
-        this.cache = config.cache;
         this.i18n = i18n;
         this.version = this.schema.info['x-versions'].application;
         this.defaultPageLimit = this.schema.info['x-page-limit'] ?? 20;
@@ -271,16 +267,16 @@ export class App implements IApp {
         this.userSettingsStore = createUserSettingsStore(this.api, userSettingsModel)(pinia);
 
         const [languages, translations, rawUser] = await Promise.all([
-            this.translationsManager.getLanguages(),
-            this.translationsManager.getTranslations(this.i18n.locale),
+            this.translationsManager.loadLanguages(),
+            this.translationsManager.loadTranslations(this.i18n.locale),
             this.api.loadUser(),
             this.userSettingsStore.init(),
         ]);
         this.languages = languages;
-        this.i18n.messages[this.i18n.locale] = translations;
+        this.i18n.setLocaleMessage(this.i18n.locale, translations);
         this.rawUser = rawUser;
 
-        void this.setLanguage(this.i18n.locale);
+        void this.setLanguage(this.i18n.locale, { skipLoad: true });
 
         this.afterInitialDataBeforeMount();
 
@@ -397,14 +393,15 @@ export class App implements IApp {
      * Method returns a promise of applying some language to app interface.
      * This method is supposed to be called after app was mounted.
      */
-    setLanguage(lang: string) {
-        return this._prefetchTranslation(lang).then(() => {
-            this.i18n.locale = lang;
-            signals.emit('app.language.changed', { lang });
-            document.documentElement.setAttribute('lang', lang);
-            document.cookie = `lang=${lang}`;
-            return lang;
-        });
+    async setLanguage(lang: string, opts?: { skipLoad?: boolean }) {
+        if (!opts?.skipLoad) {
+            await this._prefetchTranslation(lang);
+        }
+        this.i18n.locale = lang;
+        signals.emit('app.language.changed', { lang });
+        document.documentElement.setAttribute('lang', lang);
+        document.cookie = `lang=${lang}`;
+        return lang;
     }
 
     /**
@@ -417,7 +414,7 @@ export class App implements IApp {
         }
 
         return this.translationsManager
-            .getTranslations(lang)
+            .loadTranslations(lang)
             .then((transitions) => this.i18n.setLocaleMessage(lang, transitions));
     }
 
diff --git a/frontend_src/vstutils/autoupdate/AutoUpdateController.ts b/frontend_src/vstutils/autoupdate/AutoUpdateController.ts
index 0d07ebd2..d6949f9a 100644
--- a/frontend_src/vstutils/autoupdate/AutoUpdateController.ts
+++ b/frontend_src/vstutils/autoupdate/AutoUpdateController.ts
@@ -1,5 +1,5 @@
 import * as Visibility from 'visibilityjs';
-import type * as Centrifuge from 'centrifuge';
+import type { Centrifuge, Subscription, PublicationContext } from 'centrifuge';
 import { guiLocalSettings, randomSleep } from '../utils';
 
 export interface AutoUpdateAction {
@@ -30,7 +30,7 @@ type ActionId = string;
 type SubscriberId = string;
 type SubscriptionPk = string | number | undefined;
 
-interface PublicationContext extends Centrifuge.PublicationContext {
+interface PublicationContextWithData extends PublicationContext {
     data:
         | {
               pk?: string | number;
@@ -55,7 +55,7 @@ export class AutoUpdateController {
     nextBulkExecutionPromise: Promise<unknown> = Promise.resolve();
 
     centrifugoSubscribers = new Map<SubscriberId, SubscribedCentrifugoAction>();
-    channelSubscriptions = new Map<CentrifugoChannel, { sub: Centrifuge.Subscription; count: number }>();
+    channelSubscriptions = new Map<CentrifugoChannel, { sub: Subscription; count: number }>();
     channelSubscribers = new Map<CentrifugoChannel, Map<SubscriptionPk, SubscribedCentrifugoAction[]>>();
 
     subscriptionsPrefix: string;
@@ -107,9 +107,15 @@ export class AutoUpdateController {
         for (const channel of centAction.channels) {
             let subscription = this.channelSubscriptions.get(channel);
             if (!subscription) {
-                subscription = { sub: this.centrifugo!.subscribe(channel), count: 0 };
+                const sub =
+                    this.centrifugo?.getSubscription(channel) || this.centrifugo?.newSubscription(channel);
+                if (!sub) {
+                    continue;
+                }
+                sub.subscribe();
+                subscription = { sub, count: 0 };
                 this.channelSubscriptions.set(channel, subscription);
-                subscription.sub.on('publish', (event: PublicationContext) =>
+                sub.on('publication', (event: PublicationContextWithData) =>
                     this.onCentrifugoUpdate(channel, event),
                 );
             }
@@ -239,7 +245,7 @@ export class AutoUpdateController {
         }
     }
 
-    private onCentrifugoUpdate(channel: string, { data }: PublicationContext) {
+    private onCentrifugoUpdate(channel: string, { data }: PublicationContextWithData) {
         const subscribers = this.channelSubscribers.get(channel);
         if (subscribers) {
             this.bulkInvoke(subscribers.get(undefined));
diff --git a/frontend_src/vstutils/autoupdate/ComponentWithAutoUpdate.ts b/frontend_src/vstutils/autoupdate/ComponentWithAutoUpdate.ts
index e7fd1285..ea14625c 100644
--- a/frontend_src/vstutils/autoupdate/ComponentWithAutoUpdate.ts
+++ b/frontend_src/vstutils/autoupdate/ComponentWithAutoUpdate.ts
@@ -2,6 +2,7 @@ import { defineComponent } from 'vue';
 import type { CentrifugoAutoUpdateAction, TimerAutoUpdateAction } from './AutoUpdateController';
 import type { BaseView } from './../views';
 import ComponentIDMixin from '../ComponentIDMixin.js';
+import { State } from 'centrifuge';
 
 export default defineComponent({
     mixins: [ComponentIDMixin],
@@ -16,7 +17,7 @@ export default defineComponent({
             return (this.view as BaseView | null)?.subscriptionLabels;
         },
         autoupdateTriggerType() {
-            if (this.$app.centrifugoClient?.isConnected() && this.autoupdateSubscriptionLabels) {
+            if (this.$app.centrifugoClient?.state === State.Connected && this.autoupdateSubscriptionLabels) {
                 return 'centrifugo';
             }
             return 'timer';
diff --git a/frontend_src/vstutils/autoupdate/__tests__/AutoUpdateController.test.js b/frontend_src/vstutils/autoupdate/__tests__/AutoUpdateController.test.js
index ad2352e9..8656a6b1 100644
--- a/frontend_src/vstutils/autoupdate/__tests__/AutoUpdateController.test.js
+++ b/frontend_src/vstutils/autoupdate/__tests__/AutoUpdateController.test.js
@@ -1,4 +1,4 @@
-import Centrifuge from 'centrifuge';
+import { Centrifuge } from 'centrifuge';
 import { AutoUpdateController } from '../AutoUpdateController.ts';
 
 describe('AutoUpdateController', () => {
diff --git a/frontend_src/vstutils/autoupdate/useAutoUpdate.ts b/frontend_src/vstutils/autoupdate/useAutoUpdate.ts
index 7ab51ccf..415e1bb2 100644
--- a/frontend_src/vstutils/autoupdate/useAutoUpdate.ts
+++ b/frontend_src/vstutils/autoupdate/useAutoUpdate.ts
@@ -1,4 +1,5 @@
 import { onBeforeUnmount, onMounted, getCurrentInstance, onScopeDispose } from 'vue';
+import { State } from 'centrifuge';
 
 import { getApp, getUniqueId } from '@/vstutils/utils';
 import type {
@@ -25,7 +26,7 @@ export function useAutoUpdate({
     const id = getUniqueId();
 
     const autoUpdateAction: TimerAutoUpdateAction | Omit<CentrifugoAutoUpdateAction, 'pk'> =
-        app.centrifugoClient?.isConnected() && labels
+        app.centrifugoClient?.state === State.Connected && labels
             ? {
                   id,
                   callback,
diff --git a/frontend_src/vstutils/bulk.ts b/frontend_src/vstutils/bulk.ts
new file mode 100644
index 00000000..e85c92a5
--- /dev/null
+++ b/frontend_src/vstutils/bulk.ts
@@ -0,0 +1,212 @@
+import { createApiFetch } from './api-fetch';
+import type { InitAppConfig } from './init-app';
+import { BulkType, makeQueryString, type HttpMethod } from './utils';
+
+const CACHE_NAME = 'bulk-etags';
+const IS_NATIVE_CACHE_AVAILABLE = 'caches' in window;
+
+type RawBulk = {
+    method: HttpMethod | Uppercase<HttpMethod>;
+    path: string | (string | number)[];
+    version?: string;
+    query?: string;
+    headers?: Record<string, unknown>;
+    data?: Record<string, unknown>;
+};
+
+export type BulkRequest = RawBulk & {
+    authRequired?: boolean;
+};
+
+export interface BulkResponseHeaders {
+    'X-Query-Data'?: string;
+    'Content-Type'?: string;
+    ETag?: string;
+    [key: string]: string | undefined;
+}
+
+export interface BulkResponse<D = unknown> {
+    method: HttpMethod | Uppercase<HttpMethod>;
+    path: string | string[];
+    data: D;
+    status: number;
+    headers: BulkResponseHeaders;
+}
+
+type BulkResponses<T> = T extends unknown[] ? { [Idx in keyof T]: BulkResponse<T[Idx]> } : BulkResponse[];
+
+interface CollectedBulkRequest {
+    request: BulkRequest;
+    promise: Promise<BulkResponse>;
+    callbacks: Record<string, CallableFunction>;
+}
+
+type _BulkApiFetch = <Responses = unknown>(request: BulkRequest) => Promise<BulkResponse<Responses>>;
+type _BulkApiFetchRaw = <Responses = unknown>(
+    requests: BulkRequest[],
+    params?: { type?: BulkType; forceAuthRequired?: boolean },
+) => Promise<BulkResponses<Responses>>;
+
+export type BulkApiFetch = _BulkApiFetch & { raw: _BulkApiFetchRaw };
+
+const _cached = new WeakMap<InitAppConfig, BulkApiFetch>();
+
+export function createBulkApiFetch(params: { config: InitAppConfig }): BulkApiFetch {
+    let bulk = _cached.get(params.config);
+    if (!bulk) {
+        bulk = _createBulkApiFetch(params);
+        _cached.set(params.config, bulk);
+    }
+    return bulk;
+}
+
+function _createBulkApiFetch({ config }: { config: InitAppConfig }): BulkApiFetch {
+    const apiFetch = createApiFetch({ config });
+    const endpointUrl = new URL(config.api.endpointPath, config.api.url);
+    let collectedBulks: CollectedBulkRequest[] = [];
+    let sendCollectedBulksTimeoutId: ReturnType<typeof setTimeout> | null = null;
+
+    const sendBulkNotCached: _BulkApiFetchRaw = async <Responses = unknown>(
+        requests: BulkRequest[],
+        params?: { type?: BulkType; forceAuthRequired?: boolean },
+    ) => {
+        const authRequired = params?.forceAuthRequired || requests.some((req) => req.authRequired);
+        const rawRequests: RawBulk[] = requests.map((req) => {
+            return {
+                method: req.method,
+                path: req.path,
+                query: req.query,
+                headers: req.headers,
+                data: req.data,
+            };
+        });
+        const _fetch = authRequired ? apiFetch : fetch;
+        const response = await _fetch(endpointUrl, {
+            method: params?.type || BulkType.SIMPLE,
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(rawRequests),
+        });
+        const responses = (await response.json()) as BulkResponses<Responses>;
+        if (responses.length < requests.length) {
+            throw new Error('Responses count does not match requests count');
+        }
+        return responses;
+    };
+
+    const sendBulkCached: _BulkApiFetchRaw = async <Responses = unknown>(
+        requests: BulkRequest[],
+        params?: { type?: BulkType; forceAuthRequired?: boolean },
+    ) => {
+        const cache = await window.caches.open(CACHE_NAME);
+        const cachedValues = new Map();
+        for (let i = 0; i < requests.length; i++) {
+            const item = requests[i];
+            const request = _bulkItemToRequest(item);
+            const cached = await cache.match(request);
+            if (cached) {
+                cachedValues.set(
+                    i,
+                    cached.json().then((data) => ({
+                        status: cached.status,
+                        data,
+                        headers: new Proxy(cached.headers, {
+                            get(target, name: string | symbol, receiver) {
+                                if (name in target || typeof name === 'symbol') {
+                                    return Reflect.get(target, name, receiver) as unknown;
+                                }
+                                return target.get(name);
+                            },
+                        }),
+                    })),
+                );
+                if (!item.headers) item.headers = {};
+                item.headers['If-None-Match'] = cached.headers.get('ETag');
+            }
+        }
+
+        const responses = await sendBulkNotCached<Responses>(requests, params);
+
+        for (let i = 0; i < responses.length; i++) {
+            const response = responses[i];
+            if (response.status === 304 && cachedValues.has(i)) {
+                responses[i] = await cachedValues.get(i);
+            }
+            if (response.method.toUpperCase() === 'GET' && response.status < 300 && response.headers.ETag) {
+                try {
+                    void cache.put(_bulkItemToRequest(requests[i]), _bulkResultItemToResponse(response));
+                } catch (e) {
+                    console.warn(e);
+                }
+            }
+        }
+
+        return responses;
+    };
+
+    const sendBulk = IS_NATIVE_CACHE_AVAILABLE ? sendBulkCached : sendBulkNotCached;
+
+    async function sendCollectedBulks() {
+        const bulks = [...collectedBulks];
+        collectedBulks = [];
+        const requests = bulks.map(({ request }) => request);
+        try {
+            const results = await sendBulk(requests);
+            for (let idx = 0; idx < results.length; idx++) {
+                const result = results[idx];
+                bulks[idx].callbacks.resolve(result);
+            }
+        } catch (e) {
+            rejectAll(bulks, e);
+        }
+    }
+
+    const bulkApiFetch: _BulkApiFetch = async <Responses = undefined>(
+        request: BulkRequest,
+    ): Promise<BulkResponse<Responses>> => {
+        if (sendCollectedBulksTimeoutId) {
+            clearTimeout(sendCollectedBulksTimeoutId);
+        }
+        const callbacks: Record<string, CallableFunction> = {};
+        const promise = new Promise<BulkResponse<Responses>>((resolve, reject) => {
+            callbacks.resolve = resolve;
+            callbacks.reject = reject;
+        });
+        collectedBulks.push({
+            request,
+            promise,
+            callbacks,
+        });
+        sendCollectedBulksTimeoutId = setTimeout(() => sendCollectedBulks(), 100);
+        return promise;
+    };
+
+    const bulkApiFetchRaw: _BulkApiFetchRaw = sendBulk;
+
+    (bulkApiFetch as BulkApiFetch).raw = bulkApiFetchRaw;
+
+    return bulkApiFetch as BulkApiFetch;
+}
+
+function _bulkItemToRequest({ method, path, query = '', headers }: BulkRequest) {
+    path = Array.isArray(path) ? path.join('/') : path.replace(/^\/|\/$/g, '');
+    return new Request(`__bulk/${path}/${makeQueryString(query)}`, {
+        method,
+        headers: headers as Record<string, string>,
+    });
+}
+
+function _bulkResultItemToResponse({ data, status, headers }: BulkResponse) {
+    return new Response(JSON.stringify(data), {
+        status,
+        headers: {
+            'Content-Type': 'application/json',
+            ...headers,
+        },
+    });
+}
+
+function rejectAll(bulks: CollectedBulkRequest[], value: unknown) {
+    for (const bulk of bulks) {
+        bulk.callbacks.reject(value);
+    }
+}
diff --git a/frontend_src/vstutils/cleanCacheHelpers.js b/frontend_src/vstutils/cleanCacheHelpers.js
index 4173e672..e5077b84 100644
--- a/frontend_src/vstutils/cleanCacheHelpers.js
+++ b/frontend_src/vstutils/cleanCacheHelpers.js
@@ -1,5 +1,3 @@
-import { globalCache } from '@/cache';
-
 /**
  * Function, that cleans files cache, unregisters current Service Worker instance and reloads page.
  */
@@ -22,29 +20,11 @@ async function cleanAllCacheAndReloadPage({ resetAll = false } = {}) {
         window.location.reload(true);
     }
 
-    try {
-        await globalCache.clear();
-    } finally {
-        if (resetAll) {
-            localStorage.clear();
-            sessionStorage.clear();
-        } else {
-            localStorage.removeItem('gui_version');
-            localStorage.removeItem('gui_user_version');
-        }
-        await cleanServiceWorkerCache();
-    }
-}
-
-/**
- * Function, that removes OpenAPI schema from gui cache and reloads page.
- */
-async function cleanOpenApiCacheAndReloadPage() {
-    try {
-        await globalCache.delete('openapi');
-    } finally {
-        window.location.reload(true);
+    if (resetAll) {
+        localStorage.clear();
+        sessionStorage.clear();
     }
+    await cleanServiceWorkerCache();
 }
 
-export { cleanAllCacheAndReloadPage, cleanOpenApiCacheAndReloadPage };
+export { cleanAllCacheAndReloadPage };
diff --git a/frontend_src/vstutils/default-auth-app/helpers.ts b/frontend_src/vstutils/default-auth-app/helpers.ts
index 16313f50..ed1e69fe 100644
--- a/frontend_src/vstutils/default-auth-app/helpers.ts
+++ b/frontend_src/vstutils/default-auth-app/helpers.ts
@@ -39,17 +39,17 @@ export const { provide: provideInitAppConfig, inject: useInitAppConfig } =
 export async function createTranslationsManager(config: InitAppConfig) {
     const baseTranslationsManager = new TranslationsManager(config);
     const i18n = createVueI18n();
-    const availableLanguages = await baseTranslationsManager.getLanguages();
+    const availableLanguages = await baseTranslationsManager.loadLanguages();
     i18n.locale = document.documentElement.lang || getCookie('lang') || availableLanguages[0]?.code || 'en';
     if (availableLanguages.length > 0) {
-        i18n.setLocaleMessage(i18n.locale, await baseTranslationsManager.getTranslations(i18n.locale));
+        i18n.setLocaleMessage(i18n.locale, await baseTranslationsManager.loadTranslations(i18n.locale));
     }
     return {
         availableLanguages,
         i18n,
         async setLanguage(code: string) {
             i18n.locale = code;
-            i18n.setLocaleMessage(code, await baseTranslationsManager.getTranslations(code));
+            i18n.setLocaleMessage(code, await baseTranslationsManager.loadTranslations(code));
         },
     };
 }
diff --git a/frontend_src/vstutils/init-app.ts b/frontend_src/vstutils/init-app.ts
index 4806641c..49923652 100644
--- a/frontend_src/vstutils/init-app.ts
+++ b/frontend_src/vstutils/init-app.ts
@@ -1,13 +1,15 @@
-import { UserManager, WebStorageStateStore } from 'oidc-client-ts';
 import OpenAPILoader from '@/vstutils/OpenAPILoader';
 import { createApiFetch } from '@/vstutils/api-fetch';
-import { type AuthAppFactory } from './auth-app';
-import { signals } from '@/vstutils/signals';
 import { App } from '@/vstutils/app';
-import { type Cache, globalCache } from '@/cache';
+import { signals } from '@/vstutils/signals';
+import { UserManager, WebStorageStateStore } from 'oidc-client-ts';
 import type Vue from 'vue';
+import { type AuthAppFactory } from './auth-app';
 import { createDefaultPageLoader } from './default-page-loader';
-import { type AppSchema } from './schema';
+import type { AppSchema } from './schema';
+import { cleanAllCacheAndReloadPage } from './cleanCacheHelpers';
+
+const SILENT_REDIRECT_URL = new URL('/#/__oauth2_silent_redirect', window.location.origin);
 
 export type LogoutHandler = (params: { config: InitAppConfig }) => void | Promise<void>;
 
@@ -23,7 +25,6 @@ export interface InitAppConfigRaw {
         redirectUri?: string;
     };
     createAuthApp?: AuthAppFactory;
-    cache?: Cache;
     vue?: typeof Vue;
     api: {
         url: string;
@@ -39,7 +40,6 @@ export interface InitAppConfig {
     fatalErrorHandler: FatalErrorHandler;
     logoutHandler: LogoutHandler;
     createAuthApp?: AuthAppFactory;
-    cache: Cache;
     vue?: typeof Vue;
     api: ApiConfig;
 }
@@ -48,18 +48,35 @@ interface Oauth2Config {
     userManager: UserManager;
 }
 
-interface ApiConfig {
+type InitAppContext = {
+    rawConfig: InitAppConfigRaw;
+};
+
+type InitAppContextWithConfig = InitAppContext & {
+    config: InitAppConfig;
+    isCachedOauthAuthorityUsed: boolean;
+    isCachedOauthClientIdUsed: boolean;
+};
+
+export interface ApiConfig {
     url: URL;
     endpointPath: string;
     disableBulk: boolean;
 }
 
-export async function initApp(rawConf: InitAppConfigRaw) {
+export async function initApp(rawConfig: InitAppConfigRaw) {
     try {
-        const config = await getConfig(rawConf);
-        await _initApp(config);
+        const ctx = await prepareConfig({ rawConfig });
+        if (window.location.hash === SILENT_REDIRECT_URL.hash) {
+            await ctx.config.auth.userManager.signinSilentCallback();
+            return;
+        }
+        await _initApp(ctx);
     } catch (e) {
-        (rawConf.fatalErrorHandler ?? defaultStartupFatalErrorHandler)({ error: e });
+        if (e instanceof RestartAppError) {
+            return initApp(rawConfig);
+        }
+        (rawConfig.fatalErrorHandler ?? defaultStartupFatalErrorHandler)({ error: e });
     }
 }
 
@@ -68,76 +85,85 @@ export interface PageLoader {
     hide: () => void | Promise<void>;
 }
 
-async function _initApp(config: InitAppConfig) {
-    config.pageLoader.show();
+async function _initApp(ctx: InitAppContextWithConfig) {
+    ctx.config.pageLoader.show();
 
     registerSw();
 
-    if (!(await isUserLoggedIn(config))) {
-        await openAuthApp(config);
+    if (!(await isUserLoggedIn(ctx.config))) {
+        await openAuthApp(ctx);
         return;
     }
 
-    const schema = await loadSchema(config);
+    const schema = await loadSchema(ctx.config);
+    if (!verifyAndSetCachedOauthParams(ctx, schema)) {
+        throw new RestartAppError();
+    }
 
-    const app = new App({ config, schema });
+    const app = new App({ config: ctx.config, schema });
     // @ts-expect-error It's a global variable
     window.app = app;
     await app.start();
-    app.mount(createChildEl(config.el));
-    await config.pageLoader.hide();
+    app.mount(createChildEl(ctx.config.el));
+    await ctx.config.pageLoader.hide();
     return app;
 }
 
-async function getConfig(config: InitAppConfigRaw): Promise<InitAppConfig> {
-    const pageLoader = config.pageLoader ?? createDefaultPageLoader();
+function verifyAndSetCachedOauthParams(ctx: InitAppContextWithConfig, schema: AppSchema) {
+    const storageConfig = createStorageOauthConfigProvider(window.localStorage);
+    let ok = true;
+    if (ctx.isCachedOauthAuthorityUsed) {
+        const actualAuthority = getAuthorityUrlFromSchema(schema);
+        if (actualAuthority && actualAuthority !== ctx.config.auth.userManager.settings.authority) {
+            ok = false;
+            storageConfig.setAuthorityUrl(actualAuthority);
+        }
+    }
+    if (ctx.isCachedOauthClientIdUsed) {
+        const actualClientId = getClientIdFromSchema(schema);
+        if (actualClientId && actualClientId !== ctx.config.auth.userManager.settings.client_id) {
+            ok = false;
+            storageConfig.setClientId(actualClientId);
+        }
+    }
+    return ok;
+}
+
+async function prepareConfig({ rawConfig }: InitAppContext): Promise<InitAppContextWithConfig> {
+    const pageLoader = rawConfig.pageLoader ?? createDefaultPageLoader();
     pageLoader.show();
 
     const apiConfig = {
-        url: new URL(config.api.url.endsWith('/') ? config.api.url : `${config.api.url}/`),
-        endpointPath: config.api.endpointPath ?? 'endpoint/',
-        disableBulk: config.api.disableBulk ?? false,
+        url: new URL(rawConfig.api.url.endsWith('/') ? rawConfig.api.url : `${rawConfig.api.url}/`),
+        endpointPath: rawConfig.api.endpointPath ?? 'endpoint/',
+        disableBulk: rawConfig.api.disableBulk ?? false,
     } satisfies ApiConfig;
 
+    const { userManager, isCachedOauthAuthorityUsed, isCachedOauthClientIdUsed } = await _createUserManager(
+        rawConfig,
+        apiConfig,
+    );
+
     return {
-        el: getRootEl(config.el),
-        pageLoader,
-        fatalErrorHandler: config.fatalErrorHandler ?? defaultStartupFatalErrorHandler,
-        logoutHandler: config.logoutHandler ?? defaultLogoutHandler,
-        createAuthApp: config.createAuthApp,
-        auth: {
-            userManager: await _createUserManager(config, apiConfig),
+        rawConfig,
+        config: {
+            el: getRootEl(rawConfig.el),
+            pageLoader,
+            fatalErrorHandler: rawConfig.fatalErrorHandler ?? defaultStartupFatalErrorHandler,
+            logoutHandler: rawConfig.logoutHandler ?? defaultLogoutHandler,
+            createAuthApp: rawConfig.createAuthApp,
+            auth: {
+                userManager,
+            },
+            api: apiConfig,
         },
-        cache: config.cache ?? globalCache,
-        api: apiConfig,
+        isCachedOauthAuthorityUsed,
+        isCachedOauthClientIdUsed,
     };
 }
 
-export async function _createUserManager(config: InitAppConfigRaw, apiConfig: ApiConfig) {
-    const schemaConfig = createSchemaOauthConfigProvider(apiConfig);
-    const providedConfig = config.auth ?? {};
-
-    const authority = providedConfig.authorityUrl || (await schemaConfig.getAuthorityUrl());
-    if (!authority) {
-        throw new Error('Authority is not provided');
-    }
-    const clientId = providedConfig.clientId || (await schemaConfig.getClientId());
-    if (!clientId) {
-        throw new Error('Client id is not provided');
-    }
-    return new UserManager({
-        authority,
-        client_id: clientId,
-        client_secret: providedConfig.clientSecret,
-        redirect_uri: providedConfig.redirectUri ?? 'not_used',
-        monitorSession: true,
-        automaticSilentRenew: true,
-        scope: '',
-        userStore: new WebStorageStateStore({ store: window.localStorage }),
-    });
-}
-
-async function openAuthApp(config: InitAppConfig) {
+async function openAuthApp(ctx: InitAppContextWithConfig) {
+    const config = ctx.config;
     const authAppFactory =
         config.createAuthApp ?? (await import('@/vstutils/default-auth-app')).createDefaultAuthApp;
     const child = createChildEl(config.el);
@@ -151,7 +177,7 @@ async function openAuthApp(config: InitAppConfig) {
         authApp.destroy();
         config.el.innerHTML = '';
         window.location.hash = path ?? '/';
-        await _initApp(config);
+        await _initApp(ctx);
     }
     config.pageLoader.hide();
     authApp.mount(child);
@@ -183,16 +209,36 @@ function registerSw() {
 
 async function isUserLoggedIn(config: InitAppConfig): Promise<boolean> {
     const userManager = config.auth.userManager;
-    if (!(await userManager.getUser())) {
+    let user = await userManager.getUser();
+    if (!user) {
         return false;
     }
+    if (user.expired) {
+        if (!user.refresh_token) {
+            return false;
+        }
+        try {
+            user = await userManager.signinSilent();
+        } catch {
+            return false;
+        }
+        if (!user) {
+            return false;
+        }
+    }
     const userInfoEndpoint = await userManager.metadataService.getUserInfoEndpoint();
     const apiFetch = createApiFetch({ config });
     const response = await apiFetch(userInfoEndpoint);
-    if (response.status === 200) {
-        return true;
+    if (response.status !== 200) {
+        await userManager.removeUser();
+        return false;
+    }
+    const data = await response.json();
+    if (Boolean(data.anon) !== Boolean(user.profile.anon)) {
+        await userManager.removeUser();
+        return false;
     }
-    return false;
+    return true;
 }
 
 async function loadSchema(config: InitAppConfig) {
@@ -200,60 +246,9 @@ async function loadSchema(config: InitAppConfig) {
     window.schemaLoader = schemaLoader;
     const schema = await schemaLoader.loadSchema();
     signals.emit('openapi.loaded', schema);
-    sessionStorage.setItem('defaultSchema', JSON.stringify(schema));
     return schema;
 }
 
-function createSchemaOauthConfigProvider(apiConfig: ApiConfig) {
-    const loadSchemaOnce = (() => {
-        let schema: AppSchema | null = JSON.parse(sessionStorage.getItem('defaultSchema') || 'null');
-
-        return async (): Promise<AppSchema> => {
-            if (schema) {
-                return schema;
-            }
-            const url = new URL(apiConfig.endpointPath, apiConfig.url);
-            url.searchParams.set('format', 'openapi');
-            const response = await fetch(url);
-            schema = await response.json();
-            sessionStorage.setItem('defaultSchema', JSON.stringify(schema));
-            return schema as AppSchema;
-        };
-    })();
-
-    async function getAuthorityUrl() {
-        const schema = await loadSchemaOnce();
-        for (const def of Object.values(schema.securityDefinitions ?? {})) {
-            if (def.type === 'oauth2') {
-                if ('authorizationUrl' in def) {
-                    return new URL(def.authorizationUrl).origin;
-                }
-                if ('tokenUrl' in def) {
-                    return new URL(def.tokenUrl).origin;
-                }
-            }
-        }
-        return;
-    }
-
-    async function getClientId() {
-        const schema = await loadSchemaOnce();
-        for (const def of Object.values(schema.securityDefinitions ?? {})) {
-            if (def.type === 'oauth2') {
-                if ('x-clientId' in def && def['x-clientId']) {
-                    return def['x-clientId'] as string;
-                }
-            }
-        }
-        return;
-    }
-
-    return {
-        getAuthorityUrl,
-        getClientId,
-    };
-}
-
 type FatalErrorHandler = (params: { error: unknown }) => any;
 
 export const createStartupFatalErrorHandler = (f: FatalErrorHandler) => f;
@@ -267,9 +262,18 @@ const defaultStartupFatalErrorHandler = createStartupFatalErrorHandler(({ error
         'style',
         `
             font-size: 2rem;
+            margin: 0;
         `,
     );
 
+    const clearCacheAndReloadButton = document.createElement('button');
+    clearCacheAndReloadButton.textContent = 'Clear cache';
+    clearCacheAndReloadButton.className = 'btn btn-secondary';
+    clearCacheAndReloadButton.type = 'button';
+    clearCacheAndReloadButton.addEventListener('click', () => {
+        cleanAllCacheAndReloadPage({ resetAll: true });
+    });
+
     const text = document.createElement('p');
     text.textContent = `Details: ${error}`;
     text.setAttribute(
@@ -295,9 +299,11 @@ const defaultStartupFatalErrorHandler = createStartupFatalErrorHandler(({ error
             justify-content: center;
             align-items: center;
             flex-direction: column;
+            gap: 20px;
         `,
     );
     wrapper.appendChild(title);
+    wrapper.appendChild(clearCacheAndReloadButton);
     wrapper.appendChild(text);
     document.body.innerHTML = '';
     document.body.insertAdjacentElement('beforeend', wrapper);
@@ -314,3 +320,136 @@ const defaultLogoutHandler: LogoutHandler = async ({ config }) => {
     await config.auth.userManager.removeUser();
     window.location.href = '/';
 };
+
+export async function _createUserManager(config: InitAppConfigRaw, apiConfig: ApiConfig) {
+    const schemaConfig = createSchemaOauthConfigProvider(apiConfig);
+    const storageConfig = createStorageOauthConfigProvider(window.localStorage);
+    const providedConfig = config.auth ?? {};
+
+    let isCachedOauthAuthorityUsed = false;
+    let authority: string | null | undefined = providedConfig.authorityUrl;
+    if (!authority) {
+        authority = storageConfig.getAuthorityUrl();
+        if (authority) {
+            isCachedOauthAuthorityUsed = true;
+        } else {
+            authority = await schemaConfig.getAuthorityUrl();
+            if (authority) {
+                storageConfig.setAuthorityUrl(authority);
+            }
+        }
+    }
+    if (!authority) {
+        throw new Error('Authority is not provided');
+    }
+
+    let isCachedOauthClientIdUsed = false;
+    let clientId: string | null | undefined = providedConfig.clientId;
+    if (!clientId) {
+        clientId = storageConfig.getClientId();
+        if (clientId) {
+            isCachedOauthClientIdUsed = true;
+        } else {
+            clientId = await schemaConfig.getClientId();
+            if (clientId) {
+                storageConfig.setClientId(clientId);
+            }
+        }
+    }
+    if (!clientId) {
+        throw new Error('Client id is not provided');
+    }
+
+    return {
+        isCachedOauthAuthorityUsed,
+        isCachedOauthClientIdUsed,
+        userManager: new UserManager({
+            authority,
+            client_id: clientId,
+            client_secret: providedConfig.clientSecret,
+            redirect_uri: providedConfig.redirectUri ?? 'not_used',
+            automaticSilentRenew: true,
+            scope: 'openid',
+            userStore: new WebStorageStateStore({ store: window.localStorage }),
+            silent_redirect_uri: SILENT_REDIRECT_URL.toString(),
+        }),
+    };
+}
+
+export function verifyAndSaveToCache(schema: AppSchema) {
+    const storageConfig = createStorageOauthConfigProvider(window.localStorage);
+    const clientId = getClientIdFromSchema(schema);
+    if (clientId) {
+        storageConfig.setClientId(clientId);
+    }
+    const authorityUrl = getAuthorityUrlFromSchema(schema);
+    if (authorityUrl) {
+        storageConfig.setAuthorityUrl(authorityUrl);
+    }
+}
+
+function createStorageOauthConfigProvider(storage: Storage) {
+    return {
+        getAuthorityUrl: () => storage.getItem('oidc-cache:authorityUrl'),
+        getClientId: () => storage.getItem('oidc-cache:clientId'),
+        setAuthorityUrl: (value: string) => storage.setItem('oidc-cache:authorityUrl', value),
+        setClientId: (value: string) => storage.setItem('oidc-cache:clientId', value),
+    };
+}
+
+function getAuthorityUrlFromSchema(schema: AppSchema) {
+    for (const def of Object.values(schema.securityDefinitions ?? {})) {
+        if (def.type === 'oauth2') {
+            if ('authorizationUrl' in def) {
+                return new URL(def.authorizationUrl).origin;
+            }
+            if ('tokenUrl' in def) {
+                return new URL(def.tokenUrl).origin;
+            }
+        }
+    }
+    return;
+}
+
+function getClientIdFromSchema(schema: AppSchema) {
+    for (const def of Object.values(schema.securityDefinitions ?? {})) {
+        if (def.type === 'oauth2') {
+            if ('x-clientId' in def && def['x-clientId']) {
+                return def['x-clientId'] as string;
+            }
+        }
+    }
+    return;
+}
+
+function createSchemaOauthConfigProvider(apiConfig: ApiConfig) {
+    const loadSchemaOnce = (() => {
+        let schema: AppSchema | null = null;
+
+        return async (): Promise<AppSchema> => {
+            if (schema) {
+                return schema;
+            }
+            const url = new URL(apiConfig.endpointPath, apiConfig.url);
+            url.searchParams.set('format', 'openapi');
+            const response = await fetch(url);
+            schema = await response.json();
+            return schema as AppSchema;
+        };
+    })();
+
+    async function getAuthorityUrl() {
+        return getAuthorityUrlFromSchema(await loadSchemaOnce());
+    }
+
+    async function getClientId() {
+        return getClientIdFromSchema(await loadSchemaOnce());
+    }
+
+    return {
+        getAuthorityUrl,
+        getClientId,
+    };
+}
+
+class RestartAppError extends Error {}
diff --git a/frontend_src/vstutils/querySet/__tests__/QuerySet.test.js b/frontend_src/vstutils/querySet/__tests__/QuerySet.test.js
index 2806eb7d..89270646 100644
--- a/frontend_src/vstutils/querySet/__tests__/QuerySet.test.js
+++ b/frontend_src/vstutils/querySet/__tests__/QuerySet.test.js
@@ -4,6 +4,7 @@ import { makeModel, BaseModel } from '../../models';
 import StringField from '../../fields/text/StringField';
 import { QuerySet } from '../QuerySet';
 import { HttpMethods, RequestTypes } from '../../utils';
+import { createApp, createSchema, expectNthRequest } from '@/unittests';
 
 describe('QuerySet', () => {
     const idField = new IntegerField({ name: 'id', readOnly: true });
@@ -17,7 +18,8 @@ describe('QuerySet', () => {
         { id: 4, name: 'vitya' },
     ];
 
-    beforeAll(() => {
+    beforeAll(async () => {
+        await createApp({ schema: createSchema({}) });
         apiConnector.defaultVersion = 'v1';
         apiConnector.baseURL = 'http://localhost/api';
         apiConnector.endpointURL = 'http://localhost/api/endpoint/';
@@ -62,9 +64,7 @@ describe('QuerySet', () => {
     test('get list', async () => {
         fetchMock.mockResponseOnce(JSON.stringify({ count: 0, next: null, previous: null, results: [] }));
         expect((await qs.items()).length).toBe(0);
-        let [url, request] = fetchMock.mock.calls[0];
-        expect(url).toBe('http://localhost/api/v1/users/');
-        expect(request.method).toBe('get');
+        expectNthRequest(0, { method: 'get', url: 'http://localhost/api/v1/users/' });
     });
 
     test('create', async () => {
@@ -74,9 +74,7 @@ describe('QuerySet', () => {
         expect(user.id).toBe(1);
         expect(user.name).toBe('test_name');
         expect(user.email).toBe('test_mail');
-        let [url, request] = fetchMock.mock.calls[0];
-        expect(url).toBe('http://localhost/api/v1/users/');
-        expect(request.method).toBe('post');
+        expectNthRequest(0, { method: 'post', url: 'http://localhost/api/v1/users/' });
     });
 
     test('create with invalid instance', async () => {
@@ -93,9 +91,10 @@ describe('QuerySet', () => {
         fetchMock.mockResponses('{"id": 2}');
         let [user] = await qs.update(new OneUser({ id: 2 }), [new User({ id: 2 })]);
         expect(user.id).toBe(2);
-        let [url, request] = fetchMock.mock.calls[0];
-        expect(url).toBe('http://localhost/api/v1/users/2/');
-        expect(request.method).toBe('patch');
+        expectNthRequest(0, {
+            method: 'patch',
+            url: 'http://localhost/api/v1/users/2/',
+        });
     });
 
     test('method "update" with instances == undefined returns updated model', async () => {
@@ -115,22 +114,24 @@ describe('QuerySet', () => {
         expect(user).toBeTruthy();
         expect(user.id).toBe(2);
 
-        let [urlGet, requestGet] = fetchMock.mock.calls[0];
-        let [urlPatch, requestPatch] = fetchMock.mock.calls[1];
-
-        expect(urlGet).toBe('http://localhost/api/v1/users/');
-        expect(urlPatch).toBe('http://localhost/api/v1/users/2/');
-        expect(requestGet.method).toBe('get');
-        expect(requestPatch.method).toBe('patch');
+        expectNthRequest(0, {
+            method: 'get',
+            url: 'http://localhost/api/v1/users/',
+        });
+        expectNthRequest(1, {
+            method: 'patch',
+            url: 'http://localhost/api/v1/users/2/',
+        });
     });
 
     test('get by id', async () => {
         fetchMock.mockResponses('{"id": 1}');
         let user = await qs.get(1);
         expect(user.id).toBe(1);
-        let [url, request] = fetchMock.mock.calls[0];
-        expect(url).toBe('http://localhost/api/v1/users/1/');
-        expect(request.method).toBe('get');
+        expectNthRequest(0, {
+            method: 'get',
+            url: 'http://localhost/api/v1/users/1/',
+        });
     });
 
     test('get first', async () => {
@@ -142,9 +143,10 @@ describe('QuerySet', () => {
     test('delete', async () => {
         fetchMock.resetMocks();
         await qs.delete([new User({ id: 3 })]);
-        let [url, request] = fetchMock.mock.calls[0];
-        expect(url).toBe('http://localhost/api/v1/users/3/');
-        expect(request.method).toBe('delete');
+        expectNthRequest(0, {
+            method: 'delete',
+            url: 'http://localhost/api/v1/users/3/',
+        });
     });
 
     test('get one with error', async () => {
@@ -207,6 +209,10 @@ describe('QuerySet', () => {
                         results: { id: 5, name: 'User 1' },
                     },
                 },
+                {
+                    status: 500,
+                    data: {},
+                },
             ]),
         );
 
@@ -223,6 +229,10 @@ describe('QuerySet', () => {
                         results: { id: 5, name: 'User 1' },
                     },
                 },
+                {
+                    status: 500,
+                    data: {},
+                },
             ]),
         );
         await expect(qs.getOne()).rejects.toThrow('No OneUser matches the given query.');
@@ -376,7 +386,7 @@ describe('QuerySet', () => {
 
         test('update/create with error', async () => {
             const testData = { status: 400, data: { name: ['Error text'] } };
-            fetchMock.mockResponse(JSON.stringify([testData]));
+            fetchMock.mockResponse(JSON.stringify([testData, { status: 500, data: {} }]));
 
             // Create with error
             await expect(new CreateUser({ name: '' }, qs).create()).rejects.toMatchObject(testData);
@@ -429,11 +439,11 @@ describe('QuerySet', () => {
         fetchMock.once(JSON.stringify({ count: 0, next: null, previous: null, results: [] }));
         const itemsRequest = qs.items(true, { pk1: 12, pk2: 15 }).then((items) => items.length);
         await expect(itemsRequest).resolves.toBe(0);
-        expect(fetchMock.mock.calls[0][0]).toBe('http://localhost/api/v1/fragment1/12/fragment2/15/');
+        expectNthRequest(0, { url: 'http://localhost/api/v1/fragment1/12/fragment2/15/' });
 
         fetchMock.once(JSON.stringify({ id: 1337 }));
         const itemRequest = qs.get(1337, { pk1: 9, pk2: 8 }).then((instance) => instance.id);
         await expect(itemRequest).resolves.toBe(1337);
-        expect(fetchMock.mock.calls[1][0]).toBe('http://localhost/api/v1/fragment1/9/fragment2/8/1337/');
+        expectNthRequest(1, { url: 'http://localhost/api/v1/fragment1/9/fragment2/8/1337/' });
     });
 });
diff --git a/frontend_src/vstutils/store/__tests__/detailPage.test.js b/frontend_src/vstutils/store/__tests__/detailPage.test.js
index 257914be..79d6e370 100644
--- a/frontend_src/vstutils/store/__tests__/detailPage.test.js
+++ b/frontend_src/vstutils/store/__tests__/detailPage.test.js
@@ -64,7 +64,7 @@ test('createDetailViewStore', async () => {
     expect(app.store.page.sublinks[0].name).toEqual('edit');
 
     fetchMock.resetMocks();
-    fetchMock.mockResponseOnce('{}', { status: 204 });
+    fetchMock.mockResponseOnce('[{"status":204}]');
     await app.store.page.removeInstance({ instance: app.store.page.instance, fromList: false, purge: false });
     expectRequest(fetchMockCallAt(0), {
         body: [{ method: 'delete', path: ['some_list', 15] }],
diff --git a/frontend_src/vstutils/store/__tests__/page.test.js b/frontend_src/vstutils/store/__tests__/page.test.js
index 69c21c51..98c101b8 100644
--- a/frontend_src/vstutils/store/__tests__/page.test.js
+++ b/frontend_src/vstutils/store/__tests__/page.test.js
@@ -130,7 +130,7 @@ test('createListViewStore', async () => {
 
     // Check delete instance
     fetchMock.resetMocks();
-    fetchMock.mockResponseOnce('{}', { status: 204 });
+    fetchMock.mockResponseOnce('[{"status": 204}]');
     await app.store.page.removeInstance({
         instance: app.store.page.instances[0],
         fromList: true,
diff --git a/frontend_src/vstutils/store/userSettingsStore.ts b/frontend_src/vstutils/store/userSettingsStore.ts
index ade284e2..8088e2f1 100644
--- a/frontend_src/vstutils/store/userSettingsStore.ts
+++ b/frontend_src/vstutils/store/userSettingsStore.ts
@@ -58,6 +58,7 @@ export const createUserSettingsStore = (api: ApiConnector, modelClass: ModelCons
             const { data } = await api.makeRequest<InnerData<Settings>>({
                 method: HttpMethods.GET,
                 path: USER_SETTINGS_PATH,
+                useBulk: true,
             });
             signals.once('app.afterInit', () => {
                 setData(data);
diff --git a/package.json b/package.json
index fbcd388b..dd124ed4 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "admin-lte": "3.2.0-rc",
     "ansi_up": "^5.0.0",
     "bootstrap": "4.6.0",
-    "centrifuge": "^2.8.5",
+    "centrifuge": "^5.2.2",
     "compressorjs": "^1.2.1",
     "concurrently": "^8.2.2",
     "cropperjs": "^1.6.2",
diff --git a/requirements.txt b/requirements.txt
index 5a5c447a..019371ea 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,7 +21,7 @@ aiofiles~=24.1.0
 asgiref>=3.8.1
 
 # Notifications
-cent~=4.1.0
+cent~=5.0.0
 
 # Auth
 Authlib~=1.3.1
diff --git a/test_src/test_proj/test_notificator.py b/test_src/test_proj/test_notificator.py
index 54842395..7cf99605 100644
--- a/test_src/test_proj/test_notificator.py
+++ b/test_src/test_proj/test_notificator.py
@@ -1,13 +1,13 @@
-from cent import Client as CentrifugoClient
+from cent import Client as CentrifugoClient, CentRequest
 from vstutils.models.cent_notify import Notificator
 
 
-messages_log = []
+messages_log: list[CentRequest] = []
 
 
 class Client(CentrifugoClient):
-    def send(self, method=None, params=None):
-        messages_log.append(self._messages)
+    def _send(self, request: CentRequest, *args, **kwargs):
+        messages_log.append(request)
 
 
 class DummyNotificator(Notificator):
diff --git a/test_src/test_proj/test_settings.ini b/test_src/test_proj/test_settings.ini
index 37ea399e..4448fbd4 100644
--- a/test_src/test_proj/test_settings.ini
+++ b/test_src/test_proj/test_settings.ini
@@ -4,7 +4,6 @@ auth-cache-user = true
 enable_registration = true
 log_level = debug
 debug = true
-enable_custom_translations = true
 enable_admin_panel = true
 enable_agreement_terms = true
 enable_consent_to_processing = true
diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index 26d8a496..db0b9e47 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -3242,13 +3242,9 @@ def test_translate_action(self):
             }
         ]
 
-        CustomTranslations = self.get_model_class('vstutils_api.CustomTranslations')
-        CustomTranslations.objects.create(original='проверка перевода', translated="Успешно переведено", code='ru')
-
         bulk_data = [
             dict(path=['_lang', 'ru', 'translate'], method='post', data=dict(original='enter value')),
             dict(path=['_lang', 'en', 'translate'], method='post', data=dict(original='репозиторий')),
-            dict(path=['_lang', 'ru', 'translate'], method='post', data=dict(original='проверка перевода')),
         ]
         results = self.bulk(bulk_data)
         # test successful translation
@@ -3257,9 +3253,6 @@ def test_translate_action(self):
         # test not translated
         self.assertEqual(201, results[1]['status'])
         self.assertEqual(test_results[1], results[1]['data'])
-        # Custom translations
-        self.assertEqual(201, results[2]['status'])
-        self.assertEqual("Успешно переведено", results[2]['data']['translated'])
 
         # all translations equal
         ru: Language = Language.objects.get(code='ru')
@@ -5855,63 +5848,66 @@ def test_notifications(self):
         CreateHostTask.do(name='centrifugafromtask')
 
         # notify
-        self.assertEqual(len(messages_log[0]), 1, messages_log[0])
-        self.assertEqual(messages_log[0][0]['method'], 'publish')
-        self.assertDictEqual(messages_log[0][0]['params'], {
-            **messages_log[0][0]['params'],
-            'channel': f'{settings.VST_PROJECT}.update.test_proj.Host',
-            'data': {'pk': host_obj.id},
+        req = messages_log[0]
+        self.assertEqual(req.api_method, 'batch')
+        self.assertDictEqual(req.api_payload, {
+            "commands": [
+                {"publish": {"channel": "test_proj.update.test_proj.Host", "data": {"pk": host_obj.id}}},
+            ],
+            "parallel": False,
         })
 
         # bulk notify
-        self.assertEqual(len(messages_log[1]), 1, messages_log[1])
-        self.assertEqual(messages_log[1][0]['method'], 'publish')
-        self.assertDictEqual(messages_log[1][0]['params'], {
-            **messages_log[1][0]['params'],
-            'channel': f'{settings.VST_PROJECT}.update.test_proj.Host',
-            'data': {'pk': host_obj.id},
+        req = messages_log[1]
+        self.assertEqual(req.api_method, 'batch')
+        self.assertDictEqual(req.api_payload, {
+            'commands': [
+                {'publish': {'channel': 'test_proj.update.test_proj.Host', 'data': {'pk': host_obj.id}}},
+            ],
+            'parallel': False,
         })
 
         # bulk notify with channel provided
-        self.assertEqual(len(messages_log[2]), 2, messages_log[2])
-        for msg in messages_log[2]:
-            self.assertEqual(msg['method'], 'publish')
-            self.assertDictEqual(msg['params'], {
-                **msg['params'],
-                'channel': 'test_proj.update.some-channel',
-                'data': {'pk': host_obj.id},
-            })
+        req = messages_log[2]
+        self.assertEqual(req.api_method, 'batch')
+        self.assertDictEqual(req.api_payload, {
+            "commands": [
+                {"publish": {"channel": "test_proj.update.some-channel", "data": {"pk": host_obj.id}}},
+                {'publish': {'channel': 'test_proj.update.some-channel', 'data': {'pk': host_obj.id}}},
+            ],
+            "parallel": False,
+        })
 
         # notify for uuid model
-        self.assertEqual(len(messages_log[3]), 1, messages_log[3])
-        self.assertEqual(messages_log[3][0]['method'], 'publish')
-        self.assertDictEqual(messages_log[3][0]['params'], {
-            **messages_log[3][0]['params'],
-            'channel': f'{settings.VST_PROJECT}.update.test_proj.ModelWithUuid',
-            'data': {'pk': str(mwu.id), 'some-data': mwu.data},
+        req = messages_log[3]
+        self.assertEqual(req.api_method, 'batch')
+        self.assertDictEqual(req.api_payload, {
+            'commands': [
+                {'publish': {
+                    'channel': 'test_proj.update.test_proj.ModelWithUuid',
+                    'data': {'pk': str(mwu.id), 'some-data': '123'}
+                }},
+            ],
+            'parallel': False,
         })
 
         # api call
-        self.assertEqual(len(messages_log[4]), 2, messages_log[4])
-        self.assertEqual(messages_log[4][0]['method'], 'publish')
-        self.assertDictEqual(messages_log[4][0]['params'], {
-            **messages_log[4][0]['params'],
-            'channel': f'{settings.VST_PROJECT}.update.test_proj.Host',
-            'data': {'pk': host_obj.id},
-        })
-        self.assertEqual(messages_log[4][1]['method'], 'publish')
-        self.assertDictEqual(messages_log[4][1]['params'], {
-            **messages_log[4][1]['params'],
-            'channel': f'{settings.VST_PROJECT}.update.test_proj.Host',
-            'data': {'pk': host_obj2.id},
+        req = messages_log[4]
+        self.assertEqual(req.api_method, 'batch')
+        self.assertDictEqual(req.api_payload, {
+            'commands': [
+                {'publish': {'channel': 'test_proj.update.test_proj.Host', 'data': {'pk': host_obj.id}}},
+                {'publish': {'channel': 'test_proj.update.test_proj.Host', 'data': {'pk': host_obj2.id}}},
+            ],
+            'parallel': False,
         })
 
         # celery
-        self.assertEqual(len(messages_log[5]), 1, messages_log[5])
-        self.assertEqual(messages_log[5][0]['method'], 'publish')
-        self.assertDictEqual(messages_log[5][0]['params'], {
-            **messages_log[5][0]['params'],
-            'channel': f'{settings.VST_PROJECT}.update.test_proj.Host',
+        req = messages_log[5]
+        self.assertEqual(req.api_method, 'batch')
+        self.assertDictEqual(req.api_payload['commands'][0]['publish'], {
+            **req.api_payload['commands'][0]['publish'],
+            'channel': f'test_proj.update.test_proj.Host',
         })
 
 
@@ -6675,6 +6671,14 @@ def access_token_tester(self, prepare_data):
             'sup': False,
         })
 
+        # Check token with invalid signature
+        with self.patch('time.time', return_value=1000):
+            response = client.get(
+                '/api/v1/user/profile/',
+                HTTP_AUTHORIZATION=f'Bearer {token[:-7]}invalid',
+            )
+        self.assertEqual(response.status_code, 403)
+
         # Check token after expiration
         with self.patch('time.time', return_value=1061):
             response = client.get(
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index da622fd3..3be8dafe 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b15'
+__version__: str = '5.10.0b16'
diff --git a/vstutils/api/admin.py b/vstutils/api/admin.py
index 4972110f..912f209c 100644
--- a/vstutils/api/admin.py
+++ b/vstutils/api/admin.py
@@ -1,8 +1,6 @@
 import orjson
 from django.contrib import admin
 from django.utils.html import format_html
-from django.conf import settings
-from django import forms
 
 from . import models
 
@@ -40,14 +38,3 @@ def translations(self, instance):
             '<pre>{}</pre>',
             orjson.dumps(instance.translations, option=orjson.OPT_INDENT_2).decode('utf-8')
         )
-
-
-class CustomTranslationsForm(forms.ModelForm):
-    code = forms.ChoiceField(choices=settings.LANGUAGES)
-
-
-if settings.ENABLE_CUSTOM_TRANSLATIONS:
-    @admin.register(models.CustomTranslations)
-    class CustomTranslationsAdmin(admin.ModelAdmin):
-        list_display = ('original', 'code', 'translated')
-        form = CustomTranslationsForm
diff --git a/vstutils/api/migrations/0007_delete_customtranslations.py b/vstutils/api/migrations/0007_delete_customtranslations.py
new file mode 100644
index 00000000..6a852933
--- /dev/null
+++ b/vstutils/api/migrations/0007_delete_customtranslations.py
@@ -0,0 +1,16 @@
+# Generated by Django 5.0.4 on 2024-07-09 05:37
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('vstutils_api', '0006_fix_user_settings'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='CustomTranslations',
+        ),
+    ]
diff --git a/vstutils/api/models.py b/vstutils/api/models.py
index 1bf88142..481f842b 100644
--- a/vstutils/api/models.py
+++ b/vstutils/api/models.py
@@ -31,8 +31,6 @@ class Language(ListModel):
     @classmethod
     def get_etag_value(cls, pk=None):
         hashable_str = '_'.join(c for c, _ in settings.LANGUAGES) + (f'_{pk}' if pk is not None else '')
-        if settings.ENABLE_CUSTOM_TRANSLATIONS:
-            hashable_str += CustomTranslations.get_etag_value(pk)
         return hashlib.md5(hashable_str.encode('utf-8')).hexdigest()  # nosec
 
     def _get_translation_data(self, module_path_string, code, for_server=False):
@@ -59,10 +57,6 @@ def get_translations(self, for_server=False):
             translation_data.update(
                 self._get_translation_data(attr_name, code, for_server)
             )
-        if settings.ENABLE_CUSTOM_TRANSLATIONS:
-            translation_data.update(
-                CustomTranslations.objects.filter(code=code).values_list('original', 'translated')
-            )
         return translation_data
 
     @cached_property
@@ -81,21 +75,6 @@ def translate(self, text: str) -> str:
         return translated
 
 
-class CustomTranslations(BaseModel):
-    objects: Manager.from_queryset(BQuerySet)
-    _cache_responses = True
-
-    original = CharField(primary_key=True, max_length=380)
-    translated = CharField(max_length=380)
-    code = CharField(max_length=5)
-
-    class Meta:
-        default_related_name = 'custom_translations'
-        indexes = [
-            models.Index(fields=('original', 'translated', 'code'), name='%(app_label)s_translations')
-        ]
-
-
 class TwoFactor(BaseModel):
     objects: Manager.from_queryset(BQuerySet)
     recoverycode: Manager["RecoveryCode"]
diff --git a/vstutils/models/cent_notify.py b/vstutils/models/cent_notify.py
index 034b63c5..300bb197 100644
--- a/vstutils/models/cent_notify.py
+++ b/vstutils/models/cent_notify.py
@@ -2,13 +2,12 @@
 import typing as _t
 import logging
 import contextlib
-import json
 
 import orjson
 from django.db.models import signals
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from cent import Client as CentrifugoClient  # type: ignore
+from cent import Client as CentrifugoClient, BatchRequest, PublishRequest
 
 from .base import get_proxy_labels
 from ..utils import raise_context_decorator_with_default
@@ -18,11 +17,6 @@
 logger = logging.getLogger('vstutils')
 
 
-class JsonEncoder(json.JSONEncoder):
-    def default(self, o):
-        return str(o)  # nocv
-
-
 class Notificator:
     __slots__ = ('queue', 'cent_client', 'label', '_signals', '__weakref__')
     client_class = CentrifugoClient
@@ -59,10 +53,11 @@ def get_openapi_secret(self):
 
     @raise_context_decorator_with_default(verbose=False)
     def get_client(self):
-        centrifugo_client_kwargs = {**settings.CENTRIFUGO_CLIENT_KWARGS}
-        centrifugo_client_kwargs.pop('token_hmac_secret_key', None)
-        if 'json_encoder' not in centrifugo_client_kwargs:
-            centrifugo_client_kwargs['json_encoder'] = JsonEncoder
+        centrifugo_client_kwargs = {
+            'api_url': settings.CENTRIFUGO_CLIENT_KWARGS['address'],
+            'api_key': settings.CENTRIFUGO_CLIENT_KWARGS['api_key'],
+            'timeout': settings.CENTRIFUGO_CLIENT_KWARGS.get('timeout'),
+        }
         logger.debug(f"Getting Centrifugo client with kwargs: {centrifugo_client_kwargs}")
         return self.client_class(**centrifugo_client_kwargs)
 
@@ -96,19 +91,25 @@ def send(self):
 
         if objects and self.cent_client is None:
             self.cent_client = self.get_client()
+            if not self.cent_client:
+                return
+
+        publish_requests: list[PublishRequest] = []
 
         for obj_labels, data in objects:
             with contextlib.suppress(Exception):
                 for obj_label in obj_labels:
                     channel = self.get_subscription_channel(provided_label or obj_label)
-                    self.cent_client.add("publish", self.cent_client.get_publish_params(
+                    publish_requests.append(PublishRequest(
                         channel=channel,
                         data=data,
                     ))
                     sent_channels.add(channel)
-        if objects and sent_channels:
+        if publish_requests:
             logger.debug(f'Send notifications about {len(objects)} updates to channel(s) {sent_channels}.')
-            return self.cent_client.send()
+            return self.cent_client.batch(
+                BatchRequest(requests=publish_requests),
+            )
 
     async def asend(self):
         # TODO: Migrate main code here after updating to new cent package with async support.
diff --git a/vstutils/oauth2/authentication.py b/vstutils/oauth2/authentication.py
index e0198beb..c287545e 100644
--- a/vstutils/oauth2/authentication.py
+++ b/vstutils/oauth2/authentication.py
@@ -1,3 +1,4 @@
+from authlib.jose.errors import BadSignatureError
 from authlib.oauth2.base import OAuth2Error
 from authlib.oauth2.rfc6749 import MissingAuthorizationError, UnsupportedTokenTypeError
 from authlib.oauth2.rfc6750 import InvalidTokenError
@@ -40,6 +41,8 @@ def _get_request_token(request: "Request"):
         pass
     except InvalidTokenError as exc:
         raise OAuth2ErrorWrapper(exc) from exc
+    except BadSignatureError as exc:
+        raise AuthenticationFailed() from exc
 
 
 def get_session(session_key):
diff --git a/vstutils/session.py b/vstutils/session.py
index 6b585e96..45cc10f3 100644
--- a/vstutils/session.py
+++ b/vstutils/session.py
@@ -24,11 +24,7 @@ class MsgpackSessionSerializer:
     __slots__ = ()
     options = (
         ormsgpack.OPT_SERIALIZE_PYDANTIC |
-        ormsgpack.OPT_NON_STR_KEYS |
-        ormsgpack.OPT_PASSTHROUGH_TUPLE |
-        ormsgpack.OPT_PASSTHROUGH_BIG_INT |
-        ormsgpack.OPT_PASSTHROUGH_SUBCLASS |
-        ormsgpack.OPT_PASSTHROUGH_DATETIME
+        ormsgpack.OPT_NON_STR_KEYS
     )
 
     def dumps(self, obj):
diff --git a/vstutils/settings.py b/vstutils/settings.py
index 4a31713a..1cd2c5f3 100644
--- a/vstutils/settings.py
+++ b/vstutils/settings.py
@@ -158,7 +158,6 @@ class MainSection(BaseAppendSection):
         'debug': ConfigBoolType,
         'enable_admin_panel': ConfigBoolType,
         'enable_registration': ConfigBoolType,
-        'enable_custom_translations': ConfigBoolType,
         'allowed_hosts': ConfigListType,
         'first_day_of_week': ConfigIntType,
         'enable_agreement_terms': ConfigBoolType,
@@ -479,7 +478,6 @@ class DjangoEnv(environ.Env):
             'log_level': env('DJANGO_LOG_LEVEL'),
             'enable_admin_panel': env.bool(f'{ENV_NAME}_ENABLE_ADMIN_PANEL', default=False),
             'enable_registration': env.bool(f'{ENV_NAME}_ENABLE_REGISTRATION', default=False),
-            'enable_custom_translations': False,
             'ldap-server': env.str(f'{ENV_NAME}_LDAP_CONNECTION', default=None),
             'ldap-default-domain': env.str(f'{ENV_NAME}_LDAP_DOMAIN', default=''),
             'ldap-auth_format': env.str(f'{ENV_NAME}_LDAP_AUTH_FORMAT', default='cn=<username>,<domain>'),
@@ -1227,7 +1225,6 @@ def parse_db(params):
 USE_TZ: bool = True
 FIRST_DAY_OF_WEEK = main['first_day_of_week']
 LANGUAGE_COOKIE_NAME = main['language_cookie_name']
-ENABLE_CUSTOM_TRANSLATIONS = main['enable_custom_translations']
 
 
 # LOGGING settings
diff --git a/vstutils/utils.py b/vstutils/utils.py
index afc6eee0..9269e4b8 100644
--- a/vstutils/utils.py
+++ b/vstutils/utils.py
@@ -1476,7 +1476,7 @@ def add_in_vary(headers: dict, value: str):
     vary = cc_delim_re.split(
         headers.get('Vary', '').lower()
     )
-    if value not in vary:
+    if value.lower() not in vary:
         vary.append(value)
         headers['Vary'] = ', '.join(vary)
 
diff --git a/yarn.lock b/yarn.lock
index 72ba59d3..d2746885 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -953,11 +953,6 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
-"@types/long@^4.0.1":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
-  integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
-
 "@types/node@*":
   version "20.7.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-20.7.0.tgz#c03de4572f114a940bc2ca909a33ddb2b925e470"
@@ -1689,12 +1684,13 @@ caniuse-lite@^1.0.30001587:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001612.tgz#d34248b4ec1f117b70b24ad9ee04c90e0b8a14ae"
   integrity sha512-lFgnZ07UhaCcsSZgWW0K5j4e69dK1u/ltrL9lTUiFOwNHs12S3UMIEYgBV0Z6C6hRDev7iRnMzzYmKabYdXF9g==
 
-centrifuge@^2.8.5:
-  version "2.8.5"
-  resolved "https://registry.yarnpkg.com/centrifuge/-/centrifuge-2.8.5.tgz#94accdd105ddffe026f05994eaedc21e1ba82339"
-  integrity sha512-t06HyieeB2k7uSJSbVM4e7xMF+mfY8xvDtTJLF95ho0ba/X4MSoZcisi2PBzdCLyxG2BhkYW1Wcg6RUiPYTIlQ==
+centrifuge@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/centrifuge/-/centrifuge-5.2.2.tgz#4345d22f3173b0e1f6958367902b87bc4bc25a5f"
+  integrity sha512-d1PW3HxtmN7rMhtaDeLgZnSuXuTqoWhlZPC/pm0UwzTnBve1QlMgzY4DHQ21mpQYEeVGes46KKXj0cZP7/uZrw==
   dependencies:
-    protobufjs "^6.11.2"
+    events "^3.3.0"
+    protobufjs "^7.2.5"
 
 chai@^4.3.10:
   version "4.4.1"
@@ -2865,6 +2861,11 @@ event-emitter@^0.3.5, event-emitter@~0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
+events@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
+
 execa@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c"
@@ -3846,10 +3847,10 @@ lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.21, lodash@~4.17.15:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-long@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
-  integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
+long@^5.0.0:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/long/-/long-5.2.3.tgz#a3ba97f3877cf1d778eccbcb048525ebb77499e1"
+  integrity sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==
 
 loupe@^2.3.6, loupe@^2.3.7:
   version "2.3.7"
@@ -4526,10 +4527,10 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
 
-protobufjs@^6.11.2:
-  version "6.11.4"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.4.tgz#29a412c38bf70d89e537b6d02d904a6f448173aa"
-  integrity sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==
+protobufjs@^7.2.5:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.3.2.tgz#60f3b7624968868f6f739430cfbc8c9370e26df4"
+  integrity sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -4541,9 +4542,8 @@ protobufjs@^6.11.2:
     "@protobufjs/path" "^1.1.2"
     "@protobufjs/pool" "^1.1.0"
     "@protobufjs/utf8" "^1.1.0"
-    "@types/long" "^4.0.1"
     "@types/node" ">=13.7.0"
-    long "^4.0.0"
+    long "^5.0.0"
 
 pseudomap@^1.0.2:
   version "1.0.2"

From b5027f8b5841d6d0d9ab0491d65f5f621dbef773 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Mon, 15 Jul 2024 19:37:28 -0700
Subject: [PATCH 31/46] Release 5.10.0b17

### Changelog:
* Feature(backend): Use async client for centrifugo as default.
* Chore(build): Use manylinux image for build wheels.
---
 .gitlab-ci.yml                         |  4 +++-
 .run/Full.run.xml                      |  2 ++
 test_src/test_proj/test_notificator.py |  4 ++--
 tox_build.ini                          |  2 +-
 vstutils/__init__.py                   |  2 +-
 vstutils/models/cent_notify.py         | 14 +++++++-------
 vstutils/models/cent_notify.pyi        | 18 +++++-------------
 7 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20de6088..69b1d55a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,6 +115,8 @@ release:
       when: on_success
     - if: '$CI_COMMIT_BRANCH =~ /^release_/ && $GIT_ACCESS_USER && $GIT_ACCESS_PASSWORD'
       when: on_success
+    - if: '$CI_COMMIT_BRANCH =~ /^collect-release-/ && $GIT_ACCESS_USER && $GIT_ACCESS_PASSWORD'
+      when: manual
     - when: never
   before_script:
     - url_host=`echo "${CI_REPOSITORY_URL}" | sed -e "s/https:\/\/gitlab-ci-token:.*@//g"`
@@ -126,7 +128,7 @@ release:
 
 release_packages:
   stage: release
-  image: registry.gitlab.com/vstconsulting/images:ubuntu-v3
+  image: registry.gitlab.com/vstconsulting/images:manylinux_2_17
   artifacts:
     reports:
       dotenv: variables.env
diff --git a/.run/Full.run.xml b/.run/Full.run.xml
index f4f4989f..bc507e90 100644
--- a/.run/Full.run.xml
+++ b/.run/Full.run.xml
@@ -1,10 +1,12 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Full" type="Tox" factoryName="Tox" singleton="false">
     <module name="vst-utils" />
+    <option name="ENV_FILES" value="" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
       <env name="DJANGO_LOG_LEVEL" value="DEBUG" />
+      <env name="CC" value="ccache gcc" />
     </envs>
     <option name="SDK_HOME" value="$PROJECT_DIR$/env/bin/python" />
     <option name="SDK_NAME" value="Python 3.8 (vst-utils)" />
diff --git a/test_src/test_proj/test_notificator.py b/test_src/test_proj/test_notificator.py
index 7cf99605..7c8065f1 100644
--- a/test_src/test_proj/test_notificator.py
+++ b/test_src/test_proj/test_notificator.py
@@ -1,4 +1,4 @@
-from cent import Client as CentrifugoClient, CentRequest
+from cent import AsyncClient as CentrifugoClient, CentRequest
 from vstutils.models.cent_notify import Notificator
 
 
@@ -6,7 +6,7 @@
 
 
 class Client(CentrifugoClient):
-    def _send(self, request: CentRequest, *args, **kwargs):
+    async def _send(self, request: CentRequest, *args, **kwargs):
         messages_log.append(request)
 
 
diff --git a/tox_build.ini b/tox_build.ini
index 72b1e2fc..1d361d1e 100644
--- a/tox_build.ini
+++ b/tox_build.ini
@@ -41,6 +41,6 @@ allowlist_externals =
     rm
     ls
 commands =
-    bash -c "for whl in `ls {toxinidir}/dist/*.whl | grep -v manylinux | grep linux`; do auditwheel repair --plat manylinux_2_34_x86_64 $whl -w {toxinidir}/dist/; rm $whl; done"
+    bash -c "for whl in `ls {toxinidir}/dist/*.whl | grep -v manylinux | grep linux`; do auditwheel repair --plat manylinux_2_17_x86_64 $whl -w {toxinidir}/dist/; rm $whl; done"
 deps =
     auditwheel~=6.0.0
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 3be8dafe..3589a80e 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b16'
+__version__: str = '5.10.0b17'
diff --git a/vstutils/models/cent_notify.py b/vstutils/models/cent_notify.py
index 300bb197..33edb7b9 100644
--- a/vstutils/models/cent_notify.py
+++ b/vstutils/models/cent_notify.py
@@ -1,4 +1,5 @@
 # cython: binding=True
+import asyncio
 import typing as _t
 import logging
 import contextlib
@@ -7,7 +8,7 @@
 from django.db.models import signals
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from cent import Client as CentrifugoClient, BatchRequest, PublishRequest
+from cent import AsyncClient as CentrifugoClient, BatchRequest, PublishRequest
 
 from .base import get_proxy_labels
 from ..utils import raise_context_decorator_with_default
@@ -82,8 +83,11 @@ def create_notification(self, labels, data):
     def clear_messages(self):
         self.queue.clear()
 
-    @raise_context_decorator_with_default()
     def send(self):
+        with contextlib.suppress(Exception):
+            return asyncio.run(self.asend())
+
+    async def asend(self):
         self.queue, objects = [], tuple(self.queue)
 
         sent_channels = set()
@@ -107,14 +111,10 @@ def send(self):
                     sent_channels.add(channel)
         if publish_requests:
             logger.debug(f'Send notifications about {len(objects)} updates to channel(s) {sent_channels}.')
-            return self.cent_client.batch(
+            return await self.cent_client.batch(
                 BatchRequest(requests=publish_requests),
             )
 
-    async def asend(self):
-        # TODO: Migrate main code here after updating to new cent package with async support.
-        return self.send()
-
     def disconnect_all(self):
         for signal in self._signals:
             self.disconnect_signal(signal)
diff --git a/vstutils/models/cent_notify.pyi b/vstutils/models/cent_notify.pyi
index ea1510d6..5c1516b4 100644
--- a/vstutils/models/cent_notify.pyi
+++ b/vstutils/models/cent_notify.pyi
@@ -6,30 +6,22 @@ from ..utils import raise_context_decorator_with_default as raise_context_decora
 from .base import get_proxy_labels as get_proxy_labels
 from .model import BaseModel as BaseModel
 from django.db.models import signals, Model
+from cent import AsyncClient
 
 logger: logging.Logger
 
 
-class NotifyClient(_t.Protocol):
-    def add(self, method: _t.Text, params: _t.Dict): ...
-    def send(self) -> list: ...
-    def reset(self): ...
-
-
-class JsonEncoder(json.JSONEncoder):
-    def default(self, o): ...
-
 class Notificator:
-    client_class = NotifyClient
+    client_class = AsyncClient
     queue: _t.List[_t.Tuple[_t.Sequence[_t.Text], _t.Any]]
-    cent_client: NotifyClient
+    cent_client: AsyncClient
     label: _t.Text
     _json_renderer: ORJSONRenderer
     _signals: _t.List[signals.ModelSignal]
     def __init__(
         self,
         queue: _t.Optional[_t.List[_t.Tuple[_t.Sequence[_t.Text], _t.Any]]] = ...,
-        client: _t.Optional[NotifyClient] = ...,
+        client: _t.Optional[AsyncClient] = ...,
         label: _t.Optional[_t.Text] = ...,
         autoconnect: bool = ...
     ) -> None: ...
@@ -38,7 +30,7 @@ class Notificator:
     def disconnect_signal(self, signal: signals.ModelSignal): ...
     def signal_handler(self, instance: Model, *args, **kwargs) -> None: ...
     def get_openapi_secret(self) -> _t.Text: ...
-    def get_client(self) -> NotifyClient: ...
+    def get_client(self) -> AsyncClient: ...
     def create_notification_from_instance(self, instance) -> None: ...
     def create_notification(self, labels, data) -> None: ...
     def clear_messages(self) -> None: ...

From 78efbeb502f40bcf5dfce3568a093ef64f99b5df Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Mon, 15 Jul 2024 19:48:58 -0700
Subject: [PATCH 32/46] Release 5.10.0b18

### Changelog:
* Feature(backend): Use async client for centrifugo as default.
* Chore(build): Use manylinux image for build wheels.
---
 .gitlab-ci.yml       | 2 +-
 vstutils/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69b1d55a..8ff0dbdf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,6 @@ variables:
   RESTORE_CACHE_ATTEMPTS: 3
   DJANGO_LOG_LEVEL: 'CRITICAL'
   TOX_ARGS: "--workdir /cache/.tox_vstutils_${CI_COMMIT_REF_NAME}"
-  CC: "ccache gcc"
   UWSGI_PROFILE: "minimal"
 
 stages:
@@ -30,6 +29,7 @@ stages:
   variables:
     TOX_ENVS: ""
     YARN_CACHE_FOLDER: "${CI_PROJECT_DIR}/yarn"
+    CC: "ccache gcc"
   before_script:
     - >
       if [ "${CI_COMMIT_REF_NAME}" != "master" -a "${CI_COMMIT_REF_NAME}" != "developer" ]; then
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 3589a80e..a5c5a39f 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b17'
+__version__: str = '5.10.0b18'

From 8b19f6d32e09ed5d493c3ae818a1248e215917f6 Mon Sep 17 00:00:00 2001
From: Dmitriy Ovcharenko <ovcharenkodd@gmail.com>
Date: Wed, 17 Jul 2024 18:39:03 +1000
Subject: [PATCH 33/46] Feature(frontend): Use userinfo endpoint response
 instead of loading user.

---
 frontend_src/__tests__/startapp.test.ts       |  2 +-
 frontend_src/unittests/create-app.ts          |  5 +-
 frontend_src/unittests/index.ts               |  8 +-
 frontend_src/vstutils/actions.ts              | 15 +++-
 frontend_src/vstutils/api/ApiConnector.ts     | 26 +++---
 frontend_src/vstutils/app.ts                  | 31 ++-----
 frontend_src/vstutils/bulk.ts                 |  8 +-
 .../components/items/nav/TopNavigation.vue    | 80 +++++++------------
 .../vstutils/components/list/AddChild.vue     |  1 +
 .../list/NotEmptyMultiactionModal.vue         |  1 +
 .../vstutils/fields/array/ArrayFieldEdit.vue  |  1 +
 .../__tests__/DependFromFkField.test.js       |  6 +-
 .../fields/files/FileFieldSelector.vue        |  2 +
 .../fields/files/csv-file/DataTable.vue       | 11 ++-
 frontend_src/vstutils/init-app.ts             | 28 ++++---
 frontend_src/vstutils/querySet/QuerySet.ts    | 37 ++++++++-
 frontend_src/vstutils/schema.ts               |  1 +
 .../store/__tests__/actionViewStore.test.js   |  5 +-
 .../store/__tests__/deep-nested.test.js       |  5 +-
 frontend_src/vstutils/store/helpers.ts        |  1 +
 .../vstutils/store/userSettingsStore.ts       |  1 +
 frontend_src/vstutils/users/Gravatar.js       | 40 ----------
 frontend_src/vstutils/users/Gravatar.ts       | 47 +++++++++++
 frontend_src/vstutils/users/index.js          |  5 +-
 frontend_src/vstutils/utils/index.ts          |  2 +-
 frontend_src/vstutils/views/View.ts           |  6 ++
 .../vstutils/views/ViewConstructor.js         | 46 +++++++++--
 frontend_src/vstutils/webpush.ts              |  5 +-
 vstutils/__init__.py                          |  2 +-
 29 files changed, 249 insertions(+), 179 deletions(-)
 delete mode 100644 frontend_src/vstutils/users/Gravatar.js
 create mode 100644 frontend_src/vstutils/users/Gravatar.ts

diff --git a/frontend_src/__tests__/startapp.test.ts b/frontend_src/__tests__/startapp.test.ts
index ad084441..5792912d 100644
--- a/frontend_src/__tests__/startapp.test.ts
+++ b/frontend_src/__tests__/startapp.test.ts
@@ -5,7 +5,7 @@ describe('App', () => {
     test('Create and init', async () => {
         const app = await createApp();
         const { screen } = useTestCtx();
-        expect(app.user._data.username).toBe('testUser');
+        expect(app.userProfile.preferred_username).toBe('testUser');
         await waitFor(() => screen.getByText('Homepage content'));
     });
 });
diff --git a/frontend_src/unittests/create-app.ts b/frontend_src/unittests/create-app.ts
index 8ee70a04..e803ae0a 100644
--- a/frontend_src/unittests/create-app.ts
+++ b/frontend_src/unittests/create-app.ts
@@ -2,7 +2,7 @@ import { User } from 'oidc-client-ts';
 import { createLocalVue } from '@vue/test-utils';
 import VueI18n from 'vue-i18n';
 import { type AppSchema } from '@/vstutils/schema';
-import { type InitAppConfigRaw, _createUserManager } from '@/vstutils/init-app';
+import { type InitAppConfigRaw, _createUserManager, type UserProfile } from '@/vstutils/init-app';
 import { getApp } from '@/vstutils/utils';
 import testSchema from '../__mocks__/testSchema.json';
 
@@ -86,7 +86,8 @@ export async function createApp(params?: { schema?: Partial<AppSchema>; disableB
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({
                     sub: '1',
-                }),
+                    preferred_username: 'testUser',
+                } satisfies UserProfile),
             };
         }
 
diff --git a/frontend_src/unittests/index.ts b/frontend_src/unittests/index.ts
index e64db930..0f458aab 100644
--- a/frontend_src/unittests/index.ts
+++ b/frontend_src/unittests/index.ts
@@ -57,12 +57,8 @@ export function expectRequest(
         throw new Error('Request expected');
     }
     if (Array.isArray(request)) {
-        if (request[0] instanceof Request) {
-            request = request[0];
-        } else {
-            // @ts-expect-error It's actually a Request
-            request = new Request(request);
-        }
+        // @ts-expect-error It's actually a Request
+        request = new Request(...request);
     }
     if (expected.url) {
         expect(request.url).toBe(expected.url);
diff --git a/frontend_src/vstutils/actions.ts b/frontend_src/vstutils/actions.ts
index 8e9896b2..08bd7819 100644
--- a/frontend_src/vstutils/actions.ts
+++ b/frontend_src/vstutils/actions.ts
@@ -104,13 +104,16 @@ export class ActionsManager {
         instance,
         redirect = true,
         disablePopUp = false,
+        auth,
     }: {
         action: Action;
         instance?: Model;
         redirect?: boolean;
         disablePopUp?: boolean;
+        auth?: boolean;
     }): Promise<void> {
         const path = formatPath(action.path!, this.app.router.currentRoute.params, instance);
+        auth = auth || action.auth;
 
         try {
             let response: APIResponse<InnerData> | undefined;
@@ -120,10 +123,16 @@ export class ActionsManager {
                     method: action.method!,
                     path,
                     rawResponse: true,
+                    auth,
                 });
                 await downloadResponse(response);
             } else {
-                response = await this.app.api.makeRequest({ useBulk: true, method: action.method!, path });
+                response = await this.app.api.makeRequest({
+                    useBulk: true,
+                    method: action.method!,
+                    path,
+                    auth,
+                });
             }
 
             if (!disablePopUp) {
@@ -175,6 +184,7 @@ export class ActionsManager {
         throwError = false,
         disablePopUp = false,
         sendAll,
+        auth,
     }: {
         action: NotEmptyAction;
         instance: Model;
@@ -183,6 +193,7 @@ export class ActionsManager {
         throwError?: boolean;
         disablePopUp?: boolean;
         sendAll?: boolean;
+        auth?: boolean;
     }): Promise<void | APIResponse<T>> {
         if (!method) {
             method = action.method!;
@@ -213,6 +224,7 @@ export class ActionsManager {
                     path: path ?? formatPath(action.path!, this.app.router.currentRoute.params),
                     data,
                     rawResponse: true,
+                    auth,
                 });
                 await downloadResponse(response);
             } else {
@@ -221,6 +233,7 @@ export class ActionsManager {
                     path: path ?? formatPath(action.path!, this.app.router.currentRoute.params),
                     data,
                     useBulk: instance.shouldUseBulk(method),
+                    auth,
                 });
             }
 
diff --git a/frontend_src/vstutils/api/ApiConnector.ts b/frontend_src/vstutils/api/ApiConnector.ts
index ec22fbe5..35e14e54 100644
--- a/frontend_src/vstutils/api/ApiConnector.ts
+++ b/frontend_src/vstutils/api/ApiConnector.ts
@@ -67,21 +67,22 @@ export class APIResponse<T extends BulkResponse['data'] = { detail?: string }> i
 
 // makeRequest types
 
-interface BaseRequest {
+interface FetchRequest {
     method: HttpMethod;
     path: string | (string | number)[];
     version?: string;
     query?: Record<string, unknown> | string | URLSearchParams;
     headers?: Record<string, unknown>;
-}
-
-interface FetchRequest extends BaseRequest {
     data?: Record<string, unknown> | FormData;
+    auth?: boolean;
 }
 
-type MakeRequestParamsBulk = { useBulk: true; rawResponse?: false } & Omit<BaseBulkRequest, 'query'> & {
-        query?: string | Record<string, unknown> | URLSearchParams;
-    };
+type MakeRequestParamsBulk = Omit<BaseBulkRequest, 'query'> & {
+    rawResponse?: false;
+    useBulk: true;
+    query?: string | Record<string, unknown> | URLSearchParams;
+    auth?: boolean;
+};
 type MakeRequestParamsFetch = { useBulk?: false; rawResponse?: false } & FetchRequest;
 type MakeRequestParamsFetchRaw = { useBulk?: false; rawResponse: true } & FetchRequest;
 
@@ -98,6 +99,7 @@ export class ApiConnector {
     headers: Record<string, string | null | undefined>;
     baseURL: string | null = null;
     disableBulk = false;
+    fetchAuth: typeof fetch = window.fetch;
     fetch: typeof fetch = window.fetch;
     bulk?: BulkApiFetch;
 
@@ -125,7 +127,7 @@ export class ApiConnector {
         this.baseURL = new URL(app.config.api.url).toString().replace(/\/$/, '');
         this.bulk = createBulkApiFetch({ config: this.appConfig });
 
-        this.fetch = createApiFetch({ config: app.config });
+        this.fetchAuth = createApiFetch({ config: app.config });
         this.disableBulk = app.config.api.disableBulk;
 
         return this;
@@ -140,6 +142,7 @@ export class ApiConnector {
             const realBulk: BaseBulkRequest = {
                 method: req.method,
                 path: req.path,
+                auth: req.auth,
             };
             if (req.version) {
                 realBulk.version = req.version;
@@ -172,7 +175,7 @@ export class ApiConnector {
             const pathStr = Array.isArray(req.path) ? req.path.join('/') : req.path.replace(/^\//, '');
             const pathToSend = `${this.getFullUrl(pathStr)}${makeQueryString(req.query)}`;
 
-            const response = await this.fetch(pathToSend, {
+            const response = await (req.auth ? this.fetchAuth : this.fetch)(pathToSend, {
                 method: req.method,
                 headers,
                 body: preparedData,
@@ -192,11 +195,11 @@ export class ApiConnector {
     }
 
     async sendBulk<Responses = undefined>(requests: BaseBulkRequest[], type?: BulkType) {
-        return this.bulk!.raw<Responses>(requests, { type, forceAuthRequired: true });
+        return this.bulk!.raw<Responses>(requests, { type });
     }
 
     bulkQuery<T = Record<string, unknown>>(data: BaseBulkRequest): Promise<APIResponse<T>> {
-        return this.bulk!<T>({ ...data, authRequired: true }).then((response) => {
+        return this.bulk!<T>(data).then((response) => {
             return new APIResponse(response);
         });
     }
@@ -234,6 +237,7 @@ export class ApiConnector {
             path: ['user', 'profile'],
             method: 'get',
             useBulk: true,
+            auth: true,
         }).then((response) => {
             return response.data;
         });
diff --git a/frontend_src/vstutils/app.ts b/frontend_src/vstutils/app.ts
index 59aeb1ce..60445e37 100644
--- a/frontend_src/vstutils/app.ts
+++ b/frontend_src/vstutils/app.ts
@@ -17,7 +17,7 @@ import { AutoUpdateController } from '@/vstutils/autoupdate';
 import type { ComponentsRegistrator } from '@/vstutils/ComponentsRegistrator';
 import { globalComponentsRegistrator } from '@/vstutils/ComponentsRegistrator';
 import { addDefaultFields, FieldsResolver } from '@/vstutils/fields';
-import type { Model, ModelConstructor } from '@/vstutils/models';
+import type { ModelConstructor } from '@/vstutils/models';
 import { ModelsResolver } from '@/vstutils/models';
 import { ErrorHandler } from '@/vstutils/popUp';
 import { QuerySetsResolver } from '@/vstutils/querySet';
@@ -37,9 +37,8 @@ import type { IView, BaseView } from '@/vstutils/views';
 import { ListView, PageNewView, PageView, ViewsTree } from '@/vstutils/views';
 import ViewConstructor from '@/vstutils/views/ViewConstructor.js';
 import { setupPushNotifications } from '@/vstutils/webpush';
-import { type InitAppConfig } from '@/vstutils/init-app';
+import type { UserProfile, InitAppConfig } from './init-app';
 
-import type { InnerData } from '@/vstutils/utils';
 import type { GlobalStoreInitialized } from '@/vstutils/store/globalStore';
 
 export function getCentrifugoClient(address?: string, token?: string) {
@@ -61,6 +60,7 @@ export interface IApp {
     version: string;
     defaultPageLimit: number;
     schema: AppSchema;
+    userProfile: UserProfile;
     projectName: string;
 
     fieldsResolver: FieldsResolver;
@@ -78,7 +78,6 @@ export interface IApp {
 
     api: ApiConnector;
     languages: Language[] | null;
-    user: Model | null;
 
     appRootComponent: ComponentOptions<Vue>;
     additionalRootMixins: ComponentOptions<Vue>[];
@@ -111,7 +110,6 @@ export interface IApp {
 
 export interface IAppInitialized extends IApp {
     router: VueRouter;
-    user: Model;
     rootVm: TAppRoot;
     localSettingsStore: LocalSettingsStore;
     localSettingsModel: ModelConstructor;
@@ -123,6 +121,7 @@ export interface IAppInitialized extends IApp {
 interface AppParams {
     config: InitAppConfig;
     schema: AppSchema;
+    userProfile: UserProfile;
     vue?: typeof Vue;
 }
 
@@ -149,8 +148,7 @@ export class App implements IApp {
 
     api: ApiConnector;
     languages: Language[] | null;
-    rawUser: InnerData | null;
-    user: Model | null;
+    userProfile: UserProfile;
 
     appRootComponent: ComponentOptions<Vue>;
     additionalRootMixins: ComponentOptions<Vue>[];
@@ -171,12 +169,13 @@ export class App implements IApp {
     application: unknown | null = null;
     _mounted?: InstanceType<typeof Vue>;
 
-    constructor({ config, schema, vue }: AppParams) {
+    constructor({ config, schema, vue, userProfile }: AppParams) {
         globalThis.__currentApp = this;
         this.config = config;
 
         this.vue = vue ?? Vue;
         this.schema = schema;
+        this.userProfile = userProfile;
         this.router = null;
         this.i18n = i18n;
         this.version = this.schema.info['x-versions'].application;
@@ -201,14 +200,6 @@ export class App implements IApp {
         this.error_handler = new ErrorHandler();
 
         this.languages = null;
-        /**
-         * Property that stores raw user response
-         */
-        this.rawUser = null;
-        /**
-         * Object, that stores data of authorized user.
-         */
-        this.user = null;
         /**
          * Object that stores Vue components which are must be registered globally
          */
@@ -266,24 +257,18 @@ export class App implements IApp {
         }
         this.userSettingsStore = createUserSettingsStore(this.api, userSettingsModel)(pinia);
 
-        const [languages, translations, rawUser] = await Promise.all([
+        const [languages, translations] = await Promise.all([
             this.translationsManager.loadLanguages(),
             this.translationsManager.loadTranslations(this.i18n.locale),
-            this.api.loadUser(),
             this.userSettingsStore.init(),
         ]);
         this.languages = languages;
         this.i18n.setLocaleMessage(this.i18n.locale, translations);
-        this.rawUser = rawUser;
 
         void this.setLanguage(this.i18n.locale, { skipLoad: true });
 
         this.afterInitialDataBeforeMount();
 
-        const usersQs = this.views.get('/user/')?.objects;
-        const UserModel = usersQs?.getResponseModelClass(utils.RequestTypes.RETRIEVE);
-        this.user = new UserModel!(this.rawUser, usersQs);
-
         this.global_components.registerAll(this.vue);
 
         return this.prepare();
diff --git a/frontend_src/vstutils/bulk.ts b/frontend_src/vstutils/bulk.ts
index e85c92a5..406eeb1b 100644
--- a/frontend_src/vstutils/bulk.ts
+++ b/frontend_src/vstutils/bulk.ts
@@ -15,7 +15,7 @@ type RawBulk = {
 };
 
 export type BulkRequest = RawBulk & {
-    authRequired?: boolean;
+    auth?: boolean;
 };
 
 export interface BulkResponseHeaders {
@@ -68,9 +68,9 @@ function _createBulkApiFetch({ config }: { config: InitAppConfig }): BulkApiFetc
 
     const sendBulkNotCached: _BulkApiFetchRaw = async <Responses = unknown>(
         requests: BulkRequest[],
-        params?: { type?: BulkType; forceAuthRequired?: boolean },
+        params?: { type?: BulkType; forceAuth?: boolean },
     ) => {
-        const authRequired = params?.forceAuthRequired || requests.some((req) => req.authRequired);
+        const auth = params?.forceAuth || requests.some((req) => req.auth);
         const rawRequests: RawBulk[] = requests.map((req) => {
             return {
                 method: req.method,
@@ -80,7 +80,7 @@ function _createBulkApiFetch({ config }: { config: InitAppConfig }): BulkApiFetc
                 data: req.data,
             };
         });
-        const _fetch = authRequired ? apiFetch : fetch;
+        const _fetch = auth ? apiFetch : fetch;
         const response = await _fetch(endpointUrl, {
             method: params?.type || BulkType.SIMPLE,
             headers: { 'Content-Type': 'application/json' },
diff --git a/frontend_src/vstutils/components/items/nav/TopNavigation.vue b/frontend_src/vstutils/components/items/nav/TopNavigation.vue
index 114f2a3d..34ecbd2d 100644
--- a/frontend_src/vstutils/components/items/nav/TopNavigation.vue
+++ b/frontend_src/vstutils/components/items/nav/TopNavigation.vue
@@ -15,20 +15,20 @@
         <ul class="navbar-nav ml-auto">
             <li v-if="is_authenticated" class="nav-item dropdown">
                 <a class="nav-link" data-toggle="dropdown" href="#">
-                    <template v-if="enable_gravatar">
+                    <template v-if="enableGravatar">
                         <img
-                            :src="gravatar_img"
+                            :src="gravatarUrl"
                             class="img-circle elevation-1 gravatar-img"
                             alt="User gravatar"
-                            @error="setDefaultGravatar($event.target)"
+                            @error="handleGravatarError"
                         />
                     </template>
                     <template v-else>
                         <i class="fa fa-user mr-2 ico-data-default" />
                     </template>
                     <span class="text-data hidden-480">
-                        {{ $u.capitalize(user.first_name) }}
-                        {{ $u.capitalize(user.last_name) }}
+                        {{ user.given_name ? $u.capitalize(user.given_name) : '' }}
+                        {{ user.family_name ? $u.capitalize(user.family_name) : '' }}
                     </span>
                 </a>
 
@@ -37,7 +37,7 @@
                 >
                     <router-link :to="profile_url" class="dropdown-item text-data">
                         <i class="fa fa-id-card-o mr-2 ico-data-default" />
-                        {{ $u.capitalize($t('profile')) }}
+                        {{ $u.capitalize($ts('profile')) }}
                     </router-link>
                     <div class="dropdown-divider" />
 
@@ -45,25 +45,19 @@
                         <router-link :to="profile_settings_url" class="dropdown-item text-data">
                             >
                             <i class="fa fa-cogs mr-2 ico-data-default" />
-                            {{ $u.capitalize($t('settings')) }}
+                            {{ $u.capitalize($ts('settings')) }}
                         </router-link>
                         <div class="dropdown-divider" />
                     </template>
 
                     <button type="button" class="dropdown-item" @click="logout">
                         <i class="fas fa-sign-out-alt mr-2 ico-data-default" />
-                        {{ $u.capitalize($t('logout')) }}
+                        {{ $u.capitalize($ts('logout')) }}
                     </button>
                 </div>
             </li>
-            <li v-else class="nav-item">
-                <a class="nav-link" :href="login_url">
-                    <i class="fas fa-sign-out-alt text-data" />
-                    <span>{{ $u.capitalize($t('login')) }}</span>
-                </a>
-            </li>
             <li class="nav-item">
-                <a class="nav-link" role="button" @click.stop="$root.toggleUserSettings()">
+                <a class="nav-link" role="button" @click.stop="toggleControlSidebar">
                     <i class="fas fa-th-large" />
                 </a>
             </li>
@@ -71,19 +65,30 @@
     </nav>
 </template>
 
-<script>
+<script lang="ts">
     import $ from 'jquery';
-    import Gravatar from '../../../users/Gravatar.js';
-    import { saveHideMenuSettings } from '../../../utils';
+    import { computed } from 'vue';
+    import { useGravatarUrl } from '../../../users/Gravatar';
+    import { getApp, saveHideMenuSettings } from '../../../utils';
 
     /**
      * Component of top navigation menu.
      */
     export default {
         name: 'TopNav',
-        data() {
+        setup() {
+            const app = getApp();
+
+            const { gravatarUrl, handleGravatarError } = useGravatarUrl(() => app.userProfile.email);
+            const enableGravatar = computed(() => {
+                return app.schema.info['x-settings'].enable_gravatar;
+            });
+
             return {
-                gravatar: new Gravatar(),
+                user: app.userProfile,
+                gravatarUrl,
+                enableGravatar,
+                handleGravatarError,
             };
         },
         computed: {
@@ -93,24 +98,6 @@
             is_authenticated() {
                 return Boolean(this.$app.api.getUserId());
             },
-            /**
-             * Boolean property, that returns true if gravatar_mode is activated.
-             */
-            enable_gravatar() {
-                return this.$app.api.openapi.info['x-settings'].enable_gravatar;
-            },
-            /**
-             * Property, that returns object with properties of current application user.
-             */
-            user() {
-                return this.$app.user;
-            },
-            /**
-             * Property, that returns URL to user's gravatar.
-             */
-            gravatar_img() {
-                return this.gravatar.getGravatarByEmail(this.user.email);
-            },
             /**
              * Property, that returns URL to profile page.
              */
@@ -131,25 +118,16 @@
             },
         },
         mounted() {
+            // @ts-expect-error JQuery :(
             $(this.$refs.sidebarControl).PushMenu();
         },
         methods: {
             saveHideMenuSettings() {
                 saveHideMenuSettings();
             },
-            /**
-             * Method, that returns URL to default gravatar img.
-             */
-            getDefaultGravatarImg() {
-                return this.gravatar.getDefaultGravatar();
-            },
-            /**
-             * Method, that sets default gravatar img to some <img>.
-             * @param {object} el DOM img element.
-             */
-            setDefaultGravatar(el) {
-                el.src = this.getDefaultGravatarImg();
-                return false;
+            toggleControlSidebar() {
+                // @ts-expect-error No types here
+                this.$root.toggleUserSettings();
             },
             async logout() {
                 await this.$app.config.logoutHandler({ config: this.$app.config });
diff --git a/frontend_src/vstutils/components/list/AddChild.vue b/frontend_src/vstutils/components/list/AddChild.vue
index bccc9b40..43747017 100644
--- a/frontend_src/vstutils/components/list/AddChild.vue
+++ b/frontend_src/vstutils/components/list/AddChild.vue
@@ -125,6 +125,7 @@
                     method: 'post',
                     path,
                     data: { id },
+                    auth: qs.isAuthRequired(RequestTypes.CREATE),
                 }),
             ),
         );
diff --git a/frontend_src/vstutils/components/list/NotEmptyMultiactionModal.vue b/frontend_src/vstutils/components/list/NotEmptyMultiactionModal.vue
index 0b2af386..6a77dc1d 100644
--- a/frontend_src/vstutils/components/list/NotEmptyMultiactionModal.vue
+++ b/frontend_src/vstutils/components/list/NotEmptyMultiactionModal.vue
@@ -76,6 +76,7 @@
                     path,
                     data: instance._getInnerData(),
                     useBulk: instance.shouldUseBulk(method),
+                    auth: view.value.isSecure,
                 }),
             ),
         );
diff --git a/frontend_src/vstutils/fields/array/ArrayFieldEdit.vue b/frontend_src/vstutils/fields/array/ArrayFieldEdit.vue
index e23ddf55..01dfdbe7 100644
--- a/frontend_src/vstutils/fields/array/ArrayFieldEdit.vue
+++ b/frontend_src/vstutils/fields/array/ArrayFieldEdit.vue
@@ -24,6 +24,7 @@
 
 <script>
     import $ from 'jquery';
+    import Vue from 'vue';
     import { createUniqueIdGenerator } from '@/vstutils/utils';
     import { BaseFieldContentEdit } from '../base';
 
diff --git a/frontend_src/vstutils/fields/dynamic/__tests__/DependFromFkField.test.js b/frontend_src/vstutils/fields/dynamic/__tests__/DependFromFkField.test.js
index fd6026b1..db3aed4d 100644
--- a/frontend_src/vstutils/fields/dynamic/__tests__/DependFromFkField.test.js
+++ b/frontend_src/vstutils/fields/dynamic/__tests__/DependFromFkField.test.js
@@ -4,7 +4,7 @@ import {
     schemaListOf,
     waitForPageLoading,
     openPage,
-    expectRequest,
+    expectNthRequest,
 } from '@/unittests';
 
 const schema = createSchema({
@@ -168,7 +168,7 @@ describe('DependFromFkField', () => {
 
         expect(fetchMock).toBeCalledTimes(2);
         // page hit
-        expectRequest(fetchMock.mock.calls[0][0], {
+        expectNthRequest(0, {
             method: 'put',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify([
@@ -179,7 +179,7 @@ describe('DependFromFkField', () => {
             ]),
         });
         // prefetch hit
-        expectRequest(fetchMock.mock.calls[1][0], {
+        expectNthRequest(1, {
             method: 'put',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify([
diff --git a/frontend_src/vstutils/fields/files/FileFieldSelector.vue b/frontend_src/vstutils/fields/files/FileFieldSelector.vue
index 3b5a37a9..d8b80886 100644
--- a/frontend_src/vstutils/fields/files/FileFieldSelector.vue
+++ b/frontend_src/vstutils/fields/files/FileFieldSelector.vue
@@ -10,6 +10,7 @@
             <button
                 v-if="hideable"
                 class="btn input-group-text"
+                type="button"
                 :title="$ts('Hide field')"
                 @click="emit('hide')"
             >
@@ -18,6 +19,7 @@
             <button
                 v-if="clearable"
                 class="btn input-group-text"
+                type="button"
                 :title="$ts('Clear field')"
                 @click="emit('clear')"
             >
diff --git a/frontend_src/vstutils/fields/files/csv-file/DataTable.vue b/frontend_src/vstutils/fields/files/csv-file/DataTable.vue
index 02d1eb3e..60e56eee 100644
--- a/frontend_src/vstutils/fields/files/csv-file/DataTable.vue
+++ b/frontend_src/vstutils/fields/files/csv-file/DataTable.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="csv-table">
-        <button v-if="!readonly" class="btn btn-outline-primary my-2" @click="add">
+        <button v-if="!readonly" class="btn btn-outline-primary my-2" type="button" @click="add">
             <i class="fa fa-plus" />
         </button>
         <CustomVirtualTable
@@ -13,10 +13,15 @@
             language="en"
         >
             <template v-if="!readonly" #actionCommon="{ index, row }">
-                <button class="btn btn-outline-secondary" @click="edit(index, row)">
+                <button class="btn btn-outline-secondary" type="button" @click="edit(index, row)">
                     <i class="fa fa-edit" />
                 </button>
-                <button class="btn btn-outline-warning" style="margin-left: 5px" @click="del(index)">
+                <button
+                    class="btn btn-outline-warning"
+                    type="button"
+                    style="margin-left: 5px"
+                    @click="del(index)"
+                >
                     <i class="fa fa-times" />
                 </button>
             </template>
diff --git a/frontend_src/vstutils/init-app.ts b/frontend_src/vstutils/init-app.ts
index 49923652..25f990fb 100644
--- a/frontend_src/vstutils/init-app.ts
+++ b/frontend_src/vstutils/init-app.ts
@@ -2,7 +2,7 @@ import OpenAPILoader from '@/vstutils/OpenAPILoader';
 import { createApiFetch } from '@/vstutils/api-fetch';
 import { App } from '@/vstutils/app';
 import { signals } from '@/vstutils/signals';
-import { UserManager, WebStorageStateStore } from 'oidc-client-ts';
+import { type OidcStandardClaims, UserManager, WebStorageStateStore } from 'oidc-client-ts';
 import type Vue from 'vue';
 import { type AuthAppFactory } from './auth-app';
 import { createDefaultPageLoader } from './default-page-loader';
@@ -58,6 +58,8 @@ type InitAppContextWithConfig = InitAppContext & {
     isCachedOauthClientIdUsed: boolean;
 };
 
+export type UserProfile = Omit<OidcStandardClaims, 'sub'> & { sub: string };
+
 export interface ApiConfig {
     url: URL;
     endpointPath: string;
@@ -90,7 +92,9 @@ async function _initApp(ctx: InitAppContextWithConfig) {
 
     registerSw();
 
-    if (!(await isUserLoggedIn(ctx.config))) {
+    const userProfile = await getUserProfile(ctx.config);
+    if (!userProfile) {
+        await ctx.config.auth.userManager.removeUser();
         await openAuthApp(ctx);
         return;
     }
@@ -100,7 +104,7 @@ async function _initApp(ctx: InitAppContextWithConfig) {
         throw new RestartAppError();
     }
 
-    const app = new App({ config: ctx.config, schema });
+    const app = new App({ config: ctx.config, schema, userProfile });
     // @ts-expect-error It's a global variable
     window.app = app;
     await app.start();
@@ -207,38 +211,36 @@ function registerSw() {
     }
 }
 
-async function isUserLoggedIn(config: InitAppConfig): Promise<boolean> {
+async function getUserProfile(config: InitAppConfig): Promise<UserProfile | undefined> {
     const userManager = config.auth.userManager;
     let user = await userManager.getUser();
     if (!user) {
-        return false;
+        return;
     }
     if (user.expired) {
         if (!user.refresh_token) {
-            return false;
+            return;
         }
         try {
             user = await userManager.signinSilent();
         } catch {
-            return false;
+            return;
         }
         if (!user) {
-            return false;
+            return;
         }
     }
     const userInfoEndpoint = await userManager.metadataService.getUserInfoEndpoint();
     const apiFetch = createApiFetch({ config });
     const response = await apiFetch(userInfoEndpoint);
     if (response.status !== 200) {
-        await userManager.removeUser();
-        return false;
+        return;
     }
     const data = await response.json();
     if (Boolean(data.anon) !== Boolean(user.profile.anon)) {
-        await userManager.removeUser();
-        return false;
+        return;
     }
-    return true;
+    return data;
 }
 
 async function loadSchema(config: InitAppConfig) {
diff --git a/frontend_src/vstutils/querySet/QuerySet.ts b/frontend_src/vstutils/querySet/QuerySet.ts
index 8b55d93b..0241166a 100644
--- a/frontend_src/vstutils/querySet/QuerySet.ts
+++ b/frontend_src/vstutils/querySet/QuerySet.ts
@@ -52,6 +52,7 @@ export class QuerySet {
 
     listSubscriptionLabels: string[];
     prefetchEnabled: boolean;
+    secureOperations = new Set<RequestType>();
 
     constructor(
         pattern: string,
@@ -160,6 +161,18 @@ export class QuerySet {
         return model;
     }
 
+    isAuthRequired(operation: RequestType) {
+        return this.secureOperations.has(operation);
+    }
+
+    setOperationIsSecure(operation: RequestType, isSecure: boolean) {
+        if (isSecure) {
+            this.secureOperations.add(operation);
+        } else {
+            this.secureOperations.delete(operation);
+        }
+    }
+
     /**
      * Getter that returns queryset urls as string array
      */
@@ -250,6 +263,7 @@ export class QuerySet {
                 path: this._getDetailPath(id),
                 query: this.query,
                 useBulk: model.shouldUseBulk(HttpMethods.GET),
+                auth: this.isAuthRequired(RequestTypes.RETRIEVE),
             });
             instance = new model(response.data, this);
             instance._response = response;
@@ -328,6 +342,7 @@ export class QuerySet {
             path: this.getDataType(),
             query: this.query,
             useBulk: model.shouldUseBulk(HttpMethods.GET),
+            auth: this.isAuthRequired(RequestTypes.LIST),
         });
 
         const instances = createInstancesList(
@@ -370,8 +385,17 @@ export class QuerySet {
         ) {
             const pkFieldName = retrieveModel.pkField!.name;
             const results = await apiConnector.sendBulk<[Record<string, unknown>, InnerData]>([
-                { method, path: dataType, data: instance._getInnerData() },
-                { method: HttpMethods.GET, path: this._getCreateBulkPath(pkFieldName) },
+                {
+                    method,
+                    path: dataType,
+                    data: instance._getInnerData(),
+                    auth: this.isAuthRequired(RequestTypes.CREATE),
+                },
+                {
+                    method: HttpMethods.GET,
+                    path: this._getCreateBulkPath(pkFieldName),
+                    auth: this.isAuthRequired(RequestTypes.RETRIEVE),
+                },
             ]);
             APIResponse.checkStatus(results[0].status, results[0].data);
             return new retrieveModel(results[1].data, this);
@@ -382,6 +406,7 @@ export class QuerySet {
                 path: dataType,
                 query: this.query,
                 useBulk: createModel.shouldUseBulk(method),
+                auth: this.isAuthRequired(RequestTypes.CREATE),
             });
             const createdInstance = new createModel(response.data, this);
             if (createModelSameAsRetrieve) {
@@ -421,8 +446,8 @@ export class QuerySet {
             const requests = instances.flatMap((instance) => {
                 const path = this._getDetailPath(instance.getPkValue()!);
                 return [
-                    { method, path, data },
-                    { method: HttpMethods.GET, path },
+                    { method, path, data, auth: this.isAuthRequired(requestType) },
+                    { method: HttpMethods.GET, path, auth: this.isAuthRequired(RequestTypes.RETRIEVE) },
                 ];
             });
 
@@ -444,6 +469,7 @@ export class QuerySet {
                         query: this.query,
                         useBulk: modelUpdate.shouldUseBulk(method),
                         headers: Object.keys(headers).length > 0 ? headers : undefined,
+                        auth: this.isAuthRequired(requestType),
                     });
                     return new modelUpdate(response.data, this);
                 }),
@@ -473,6 +499,7 @@ export class QuerySet {
                     path: this._getDetailPath(instance.getPkValue()!),
                     headers,
                     useBulk,
+                    auth: this.isAuthRequired(RequestTypes.REMOVE),
                 });
             }),
         );
@@ -499,6 +526,7 @@ export class QuerySet {
             query: req.query,
             headers: req.headers,
             version: req.version,
+            auth: req.auth,
         };
 
         if (data !== undefined) {
@@ -529,6 +557,7 @@ interface InternalRequest {
     headers?: Record<string, unknown>;
     useBulk?: boolean;
     version?: string;
+    auth?: boolean;
 }
 
 export default QuerySet;
diff --git a/frontend_src/vstutils/schema.ts b/frontend_src/vstutils/schema.ts
index 1b544a89..faf7685d 100644
--- a/frontend_src/vstutils/schema.ts
+++ b/frontend_src/vstutils/schema.ts
@@ -27,6 +27,7 @@ export interface AppInfo extends swagger.Info {
         static_path: string;
         login_url: string;
         logout_url: string;
+        enable_gravatar?: boolean;
         [key: string]: any;
     };
     'x-versions': {
diff --git a/frontend_src/vstutils/store/__tests__/actionViewStore.test.js b/frontend_src/vstutils/store/__tests__/actionViewStore.test.js
index 2c5eb2c4..3648ed77 100644
--- a/frontend_src/vstutils/store/__tests__/actionViewStore.test.js
+++ b/frontend_src/vstutils/store/__tests__/actionViewStore.test.js
@@ -1,4 +1,4 @@
-import { createApp, createSchema, expectRequest, waitForPageLoading } from '@/unittests';
+import { createApp, createSchema, expectNthRequest, waitForPageLoading } from '@/unittests';
 import detailPageSchema from './detailPage-schema.json';
 import { ActionView } from '../../views';
 
@@ -45,8 +45,7 @@ test('createActionViewStore', async () => {
         );
         await store.execute();
         expect(fetchMock).toBeCalledTimes(1);
-        let [request] = fetchMock.mock.calls[0];
-        expectRequest(request, {
+        expectNthRequest(0, {
             body: [
                 {
                     method: 'post',
diff --git a/frontend_src/vstutils/store/__tests__/deep-nested.test.js b/frontend_src/vstutils/store/__tests__/deep-nested.test.js
index 21cb6266..41b09d39 100644
--- a/frontend_src/vstutils/store/__tests__/deep-nested.test.js
+++ b/frontend_src/vstutils/store/__tests__/deep-nested.test.js
@@ -1,5 +1,4 @@
-import { createApp } from '@/unittests/create-app';
-import { createSchema } from '@/unittests/schema';
+import { createApp, createSchema } from '@/unittests';
 import deepNestedSchema from './deep-nested-schema.json';
 import { waitFor } from '@testing-library/dom';
 
@@ -27,7 +26,7 @@ test('filtering of deep nested on root page', async () => {
     );
     await app.router.push('/group/');
     await waitFor(() => expect(fetchMock).toBeCalledTimes(1));
-    const [request] = fetchMock.mock.calls[0];
+    const request = new Request(...fetchMock.mock.calls[0]);
     const body = JSON.parse(request.body.toString());
     expect(new URLSearchParams(body[0].query).get('__deep_parent')).toBe('');
 });
diff --git a/frontend_src/vstutils/store/helpers.ts b/frontend_src/vstutils/store/helpers.ts
index 8834628b..8863fa18 100644
--- a/frontend_src/vstutils/store/helpers.ts
+++ b/frontend_src/vstutils/store/helpers.ts
@@ -473,6 +473,7 @@ export const createActionStore = (view: ActionView) => {
                 method: view.method,
                 path: view.getRequestPath(app.router.currentRoute),
                 throwError: true,
+                auth: view.isSecure,
             });
             pageWithEditableData.instance.value!.sandbox.markUnchanged();
             pageWithEditableData.fieldsErrors.value = {};
diff --git a/frontend_src/vstutils/store/userSettingsStore.ts b/frontend_src/vstutils/store/userSettingsStore.ts
index 8088e2f1..df17b357 100644
--- a/frontend_src/vstutils/store/userSettingsStore.ts
+++ b/frontend_src/vstutils/store/userSettingsStore.ts
@@ -59,6 +59,7 @@ export const createUserSettingsStore = (api: ApiConnector, modelClass: ModelCons
                 method: HttpMethods.GET,
                 path: USER_SETTINGS_PATH,
                 useBulk: true,
+                auth: true,
             });
             signals.once('app.afterInit', () => {
                 setData(data);
diff --git a/frontend_src/vstutils/users/Gravatar.js b/frontend_src/vstutils/users/Gravatar.js
deleted file mode 100644
index 77c086ea..00000000
--- a/frontend_src/vstutils/users/Gravatar.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import md5 from 'md5';
-import { getApp } from '@/vstutils/utils';
-
-/**
- * Class, that defines urls to users gravatars.
- */
-export default class Gravatar {
-    /**
-     * Constructor of Gravatar class.
-     * @param {object} opt Object with Gravatar object properties.
-     */
-    constructor(opt = {}) {
-        this.base_url = 'https://www.gravatar.com/avatar/{hash}?d=mp';
-
-        if (opt.base_url) {
-            this.base_url = opt.base_url;
-        }
-
-        this.default_gravatar = getApp().api.openapi.info['x-settings'].static_path + 'img/anonymous.png';
-    }
-    /**
-     * Method, that returns url of default gravatar image.
-     * @returns {string}
-     */
-    getDefaultGravatar() {
-        return this.default_gravatar;
-    }
-    /**
-     * Method, that defines url of user's gravatar image and returns it.
-     * @param {string} email User's email.
-     * @returns {string}
-     */
-    getGravatarByEmail(email) {
-        if (!email) {
-            return this.getDefaultGravatar();
-        }
-
-        return this.base_url.format({ hash: md5(email) });
-    }
-}
diff --git a/frontend_src/vstutils/users/Gravatar.ts b/frontend_src/vstutils/users/Gravatar.ts
new file mode 100644
index 00000000..1a161d10
--- /dev/null
+++ b/frontend_src/vstutils/users/Gravatar.ts
@@ -0,0 +1,47 @@
+// @ts-expect-error md5 has no types
+import md5 from 'md5';
+import { getApp } from '@/vstutils/utils';
+import { type ReadonlyRefOrGetter, toValue } from '@vueuse/core';
+import { computed, ref } from 'vue';
+
+/**
+ * Class, that defines urls to users gravatars.
+ */
+export default class Gravatar {
+    base_url: string;
+    default_gravatar: string;
+
+    constructor(opt: { base_url?: string } = {}) {
+        this.base_url = opt?.base_url || 'https://www.gravatar.com/avatar/{hash}?d=mp';
+
+        this.default_gravatar = getApp().schema.info['x-settings'].static_path + 'img/anonymous.png';
+    }
+
+    getDefaultGravatar() {
+        return this.default_gravatar;
+    }
+
+    getGravatarByEmail(email: string | undefined | null) {
+        if (!email) {
+            return this.getDefaultGravatar();
+        }
+        return this.base_url.replace('{hash}', md5(email));
+    }
+}
+
+export function useGravatarUrl(email: ReadonlyRefOrGetter<string | undefined | null>) {
+    const gravatar = new Gravatar();
+    const useDefaultGravatar = ref(false);
+    const gravatarUrl = computed(() => {
+        if (useDefaultGravatar.value) {
+            return gravatar.getDefaultGravatar();
+        }
+        return gravatar.getGravatarByEmail(toValue(email));
+    });
+    return {
+        gravatarUrl,
+        handleGravatarError: () => {
+            useDefaultGravatar.value = true;
+        },
+    };
+}
diff --git a/frontend_src/vstutils/users/index.js b/frontend_src/vstutils/users/index.js
index e094225a..97388274 100644
--- a/frontend_src/vstutils/users/index.js
+++ b/frontend_src/vstutils/users/index.js
@@ -1,6 +1,6 @@
 import { computed } from 'vue';
 import { signals } from '@/vstutils/signals';
-import Gravatar from './Gravatar.js';
+import Gravatar from './Gravatar.ts';
 import TFAPage from './TFAPage.vue';
 import { IntegerField } from '../fields/numbers/integer.js';
 import { guiPopUp, pop_up_msg } from '../popUp';
@@ -86,7 +86,8 @@ signals.once('allViews.created', ({ views }) => {
         const secretUri = computed(() => {
             const secret = store.sandbox.value.secret;
             if (secret) {
-                const username = app.user.getViewFieldValue();
+                const username =
+                    app.userProfile.preferred_username || app.userProfile.email || app.userProfile.given_name;
                 return `otpauth://totp/${app.projectName}:${username}?secret=${secret}`;
             }
             return null;
diff --git a/frontend_src/vstutils/utils/index.ts b/frontend_src/vstutils/utils/index.ts
index 66f8ac3c..faa1268b 100644
--- a/frontend_src/vstutils/utils/index.ts
+++ b/frontend_src/vstutils/utils/index.ts
@@ -319,7 +319,7 @@ export async function openSublink(sublink: Sublink, instance?: Model) {
         try {
             const response = sublink.external
                 ? await fetch(path)
-                : await api.makeRequest({ rawResponse: true, method: 'get', path: path });
+                : await api.makeRequest({ rawResponse: true, method: 'get', path: path, auth: sublink.auth });
             await downloadResponse(response);
         } catch (e) {
             error_handler.defineErrorAndShow(e);
diff --git a/frontend_src/vstutils/views/View.ts b/frontend_src/vstutils/views/View.ts
index a49c771a..71aade20 100644
--- a/frontend_src/vstutils/views/View.ts
+++ b/frontend_src/vstutils/views/View.ts
@@ -61,6 +61,7 @@ export interface Operation {
     doNotShowOnList?: boolean;
     doNotGroup?: boolean;
     isFileResponse?: boolean;
+    auth?: boolean;
 }
 
 export interface Sublink extends Operation {
@@ -84,6 +85,7 @@ export interface Action extends Operation {
     path?: string;
     href?: string;
     method?: HttpMethod;
+    auth?: boolean;
     confirmationRequired?: boolean;
     view?: ActionView;
     responseModel?: ModelConstructor;
@@ -124,6 +126,7 @@ export interface ViewParams extends SwaggerOperation {
     responseModel?: ModelConstructor;
     autoupdate?: boolean;
     routeName?: string;
+    isSecure?: boolean;
     [key: string]: any;
 }
 
@@ -151,6 +154,7 @@ export interface IView<
     hidden: boolean;
     routeName: string;
     mixins: ViewMixin[];
+    isSecure?: boolean;
 
     sublinks: Map<string, Sublink>;
     actions: Map<string, Action>;
@@ -212,6 +216,7 @@ export abstract class BaseView<
     autoupdate: boolean;
     subscriptionLabels: string[] | null;
     mixins: ViewMixin[];
+    isSecure?: boolean;
 
     sublinks = new Map<string, Sublink>();
     actions = new Map<string, Action>();
@@ -237,6 +242,7 @@ export abstract class BaseView<
         this.autoupdate = params.autoupdate ?? false;
         this.subscriptionLabels = params['x-subscribe-labels'] || null;
         this.mixins = mixins;
+        this.isSecure = params.isSecure;
     }
 
     isEditPage(): this is PageEditView {
diff --git a/frontend_src/vstutils/views/ViewConstructor.js b/frontend_src/vstutils/views/ViewConstructor.js
index 91074b40..352c52e6 100644
--- a/frontend_src/vstutils/views/ViewConstructor.js
+++ b/frontend_src/vstutils/views/ViewConstructor.js
@@ -37,6 +37,7 @@ const FILTERS_TO_EXCLUDE = ['limit', 'offset'];
 const EDIT_STYLE_PROPERTY_NAME = 'x-edit-style';
 const ACTION_NAME = 'x-action-name';
 const IS_MULTI_ACTION_PROPERTY_NAME = 'x-multiaction';
+const OAUTH2_SECURITY_DEF_NAME = 'oauth2';
 
 /**
  * Class used to create views objects from schema
@@ -126,7 +127,7 @@ export default class ViewConstructor {
 
     /**
      * Method, that creates views based on OpenApi schema.
-     * @param {object} schema OpenApi Schema.
+     * @param {import('../schema').AppSchema} schema OpenApi Schema.
      * @return {Map<string, View>} views Dict of views objects.
      */
     getViews(schema) {
@@ -140,6 +141,7 @@ export default class ViewConstructor {
         paths.sort();
 
         const editStyleViewDefault = schema.info[EDIT_STYLE_PROPERTY_NAME];
+        const hasOauth2SecurityDef = schema.securityDefinitions[OAUTH2_SECURITY_DEF_NAME]?.type === 'oauth2';
 
         const deepNestedParents = [];
 
@@ -167,6 +169,7 @@ export default class ViewConstructor {
             /** @type {PageNewView} */
             let newView = null;
             let hasRemoveAction = false;
+            let isRemoveActionSecure = false;
 
             /**
              * @type {ActionView}
@@ -190,6 +193,9 @@ export default class ViewConstructor {
             );
 
             for (const httpMethod of Object.values(HttpMethods)) {
+                /**
+                 * @type {import('../schema').Operation}
+                 */
                 const operationSchema = pathSchema[httpMethod];
                 if (!operationSchema) continue;
                 const operationId = operationSchema[this.dictionary.paths.operation_id.name];
@@ -203,8 +209,20 @@ export default class ViewConstructor {
                 const isFileResponse = responseSchemaType === 'file';
                 const responseModel = this._getOperationModel(response);
 
+                // TODO improve auth vst/vst-utils#646
+                const isSecure =
+                    hasOauth2SecurityDef &&
+                    operationSchema.security &&
+                    operationSchema.security.some((sec) => sec[OAUTH2_SECURITY_DEF_NAME]);
+
                 const operationOptions = mergeDeep(
-                    { method: httpMethod, requestModel, responseModel, isDeepNested: Boolean(deepNestedOn) },
+                    {
+                        method: httpMethod,
+                        requestModel,
+                        responseModel,
+                        isDeepNested: Boolean(deepNestedOn),
+                        isSecure,
+                    },
                     commonOptions,
                     operationSchema,
                     this.getOperationOptions(operationId, path, httpMethod),
@@ -254,6 +272,7 @@ export default class ViewConstructor {
                     views.set(editView.path, editView);
                 } else if (operationOptions.type === ViewTypes.PAGE_REMOVE) {
                     hasRemoveAction = true;
+                    isRemoveActionSecure = isSecure;
                 } else if (operationOptions.type === ViewTypes.ACTION) {
                     const isEmpty =
                         !requestModel || requestModel.writableFields.length === 0 || requestModel === NoModel;
@@ -276,6 +295,7 @@ export default class ViewConstructor {
                         isFileResponse,
                         hidden: operationOptions['x-hidden'],
                         iconClasses: operationOptions['x-icons'] || operationOptions.iconClasses,
+                        auth: isSecure,
                     };
                     if (!isEmpty) {
                         operationOptions.action = params;
@@ -305,15 +325,21 @@ export default class ViewConstructor {
             const isDetailWithoutList = isDetailPath && !dataType[dataType.length - 1].includes('{');
             const isListDetail = parentIsList && isDetailPath && dataType[dataType.length - 1].includes('{');
 
+            if (isListPath) {
+                listView.objects.setOperationIsSecure(RequestTypes.LIST, listView.isSecure);
+            }
+
             // Set list path models
             if (isListDetail) {
                 parent.objects.models[RequestTypes.RETRIEVE] = pageView.modelsList;
                 pageView.objects = parent.objects;
+                parent.objects.setOperationIsSecure(RequestTypes.RETRIEVE, pageView.isSecure);
                 if (editView) {
                     const requestType = editView.isPartial
                         ? RequestTypes.PARTIAL_UPDATE
                         : RequestTypes.UPDATE;
                     parent.objects.models[requestType] = editView.modelsList;
+                    parent.objects.setOperationIsSecure(requestType, editView.isSecure);
                     editView.objects = parent.objects;
                 }
             }
@@ -322,6 +348,7 @@ export default class ViewConstructor {
             if (isListPath && newView) {
                 listView.objects.models[RequestTypes.CREATE] = newView.modelsList;
                 newView.objects = listView.objects;
+                newView.objects.setOperationIsSecure(RequestTypes.CREATE, newView.isSecure);
             }
 
             // Set detail path models
@@ -333,10 +360,12 @@ export default class ViewConstructor {
                     {},
                     pathParameters,
                 );
+                pageView.objects.setOperationIsSecure(RequestTypes.RETRIEVE, pageView.isSecure);
                 if (newView) {
                     newView.mixins.push(DetailWithoutListPageMixin);
                     pageView.objects.models[RequestTypes.CREATE] = newView.modelsList;
                     newView.objects = pageView.objects;
+                    newView.objects.setOperationIsSecure(RequestTypes.CREATE, newView.isSecure);
                 }
                 if (editView) {
                     editView.mixins.push(DetailWithoutListPageMixin);
@@ -345,6 +374,7 @@ export default class ViewConstructor {
                         : RequestTypes.UPDATE;
                     pageView.objects.models[requestType] = editView.modelsList;
                     editView.objects = pageView.objects;
+                    editView.objects.setOperationIsSecure(requestType, editView.isSecure);
                 }
             }
 
@@ -372,6 +402,7 @@ export default class ViewConstructor {
                     title: pageView.title,
                     href: pageView.path,
                     isFileResponse: pageView.isFileResponse,
+                    auth: pageView.isSecure,
                 });
             }
 
@@ -403,11 +434,16 @@ export default class ViewConstructor {
             if (hasRemoveAction) {
                 const baseOperations = this.dictionary.paths.operations.base;
                 let pageRemoveAction = mergeDeep(
-                    {},
+                    { auth: isRemoveActionSecure },
                     parent?.actions.get('add') ? baseOperations.nested_remove : baseOperations.remove,
                 );
-                if (pageView) pageView.actions.set(pageRemoveAction.name, pageRemoveAction);
-                if (parentIsList) parent.multiActions.set(pageRemoveAction.name, pageRemoveAction);
+                if (pageView) {
+                    pageView.actions.set(pageRemoveAction.name, pageRemoveAction);
+                    pageView.objects.setOperationIsSecure(RequestTypes.REMOVE, isRemoveActionSecure);
+                }
+                if (parentIsList) {
+                    parent.multiActions.set(pageRemoveAction.name, pageRemoveAction);
+                }
             }
 
             // Set new sublink/action
diff --git a/frontend_src/vstutils/webpush.ts b/frontend_src/vstutils/webpush.ts
index 827f4a31..8a757726 100644
--- a/frontend_src/vstutils/webpush.ts
+++ b/frontend_src/vstutils/webpush.ts
@@ -120,6 +120,7 @@ async function setupAppNotifications(app: IApp, view: PageEditView) {
             throw new Error(`WebPush subscription data is missing ${JSON.stringify(data)}`);
         }
         await app.api.makeRequest({
+            auth: true,
             useBulk: true,
             method: HttpMethods.PATCH,
             path: qs.url,
@@ -240,8 +241,7 @@ export function setupPushNotifications(app: IApp) {
 
     onFilterOperations('sublinks', '/user/{id}/', (obj) => {
         const notificationSettingsViewSubpath = getUserNotificationSettingsViewSubpath(app);
-        // @ts-expect-error User actually has id
-        if (obj.data!.id !== app.user!.id) {
+        if (String(obj.data!.id) !== app.userProfile.sub) {
             obj.sublinks = obj.sublinks.filter((sublink) => sublink.name !== notificationSettingsViewSubpath);
         }
     });
@@ -278,6 +278,7 @@ export function setupPushNotifications(app: IApp) {
                         throw new Error(`WebPush subscription data is missing ${JSON.stringify(data)}`);
                     }
                     await app.api.makeRequest({
+                        auth: true,
                         useBulk: true,
                         method: HttpMethods.PATCH,
                         path: app.router!.currentRoute.path,
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index a5c5a39f..2c372499 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b18'
+__version__: str = '5.10.0b19'

From 7e233b48c6e4a6e4c21ad00c244a30fb9ffbccd5 Mon Sep 17 00:00:00 2001
From: Dmitriy Ovcharenko <ovcharenkodd@gmail.com>
Date: Fri, 19 Jul 2024 00:37:57 +1000
Subject: [PATCH 34/46] Fix(frontend): Prevent selection of items with children
 in DeepFkField when only_last_child is set to True.

---
 frontend_src/vstutils/bulk.ts                 |  2 +-
 .../vstutils/fields/fk/deep-fk/DeepFKField.js | 22 ++++++++++---
 .../fk/deep-fk/DeepFkArrayFieldEdit.vue       |  2 ++
 .../vstutils/fields/fk/deep-fk/FkTree.vue     | 32 ++++++++++++-------
 vstutils/__init__.py                          |  2 +-
 vstutils/api/schema/views.py                  |  8 +++++
 6 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/frontend_src/vstutils/bulk.ts b/frontend_src/vstutils/bulk.ts
index 406eeb1b..b509c6a5 100644
--- a/frontend_src/vstutils/bulk.ts
+++ b/frontend_src/vstutils/bulk.ts
@@ -131,7 +131,7 @@ function _createBulkApiFetch({ config }: { config: InitAppConfig }): BulkApiFetc
             if (response.status === 304 && cachedValues.has(i)) {
                 responses[i] = await cachedValues.get(i);
             }
-            if (response.method.toUpperCase() === 'GET' && response.status < 300 && response.headers.ETag) {
+            if (response.status < 300 && response.method.toUpperCase() === 'GET' && response.headers.ETag) {
                 try {
                     void cache.put(_bulkItemToRequest(requests[i]), _bulkResultItemToResponse(response));
                 } catch (e) {
diff --git a/frontend_src/vstutils/fields/fk/deep-fk/DeepFKField.js b/frontend_src/vstutils/fields/fk/deep-fk/DeepFKField.js
index 5bda8454..d62c7528 100644
--- a/frontend_src/vstutils/fields/fk/deep-fk/DeepFKField.js
+++ b/frontend_src/vstutils/fields/fk/deep-fk/DeepFKField.js
@@ -45,11 +45,11 @@ class DeepFKField extends FKField {
 
     createTreeData(rawData) {
         const data = JSON.parse(JSON.stringify(rawData));
-        const idsByIndex = new Map();
+        const idxById = new Map();
         const roots = [];
 
         for (let idx = 0; idx < data.length; idx++) {
-            idsByIndex.set(this.getValueFieldValue(rawData[idx]), idx);
+            idxById.set(this.getValueFieldValue(rawData[idx]), idx);
             data[idx].children = [];
         }
 
@@ -60,14 +60,28 @@ class DeepFKField extends FKField {
                 text: this.getViewFieldValue(rawData[i]),
                 parent: this.getParentFieldValue(rawData[i]),
                 children: data[i].children,
+                state: {},
             };
 
-            if (![null, node.id].includes(node.parent) && idsByIndex.has(node.parent)) {
-                data[idsByIndex.get(node.parent)].children.push(node);
+            if (![null, node.id].includes(node.parent) && idxById.has(node.parent)) {
+                data[idxById.get(node.parent)].children.push(node);
             } else {
                 roots.push(node);
             }
         }
+
+        if (this.onlyLastChild) {
+            const setIsSelectable = (nodes) => {
+                for (const node of nodes) {
+                    if (node.children.length > 0) {
+                        node.state.selectable = false;
+                        setIsSelectable(node.children);
+                    }
+                }
+            };
+            setIsSelectable(roots);
+        }
+
         return roots;
     }
 
diff --git a/frontend_src/vstutils/fields/fk/deep-fk/DeepFkArrayFieldEdit.vue b/frontend_src/vstutils/fields/fk/deep-fk/DeepFkArrayFieldEdit.vue
index c3d81c19..f1af1366 100644
--- a/frontend_src/vstutils/fields/fk/deep-fk/DeepFkArrayFieldEdit.vue
+++ b/frontend_src/vstutils/fields/fk/deep-fk/DeepFkArrayFieldEdit.vue
@@ -3,6 +3,8 @@
         :field="field.itemField"
         :value="value ?? []"
         multiple
+        :min-items="field.minItems"
+        :max-items="field.maxItems"
         @update:value="(value) => setValue(value)"
     />
 </template>
diff --git a/frontend_src/vstutils/fields/fk/deep-fk/FkTree.vue b/frontend_src/vstutils/fields/fk/deep-fk/FkTree.vue
index f0ff4a29..bd81fb3f 100644
--- a/frontend_src/vstutils/fields/fk/deep-fk/FkTree.vue
+++ b/frontend_src/vstutils/fields/fk/deep-fk/FkTree.vue
@@ -60,16 +60,23 @@
     // imports in tests are broken
     const Tree = LiquorTree.default || LiquorTree;
 
-    const props = defineProps<{
-        value: (number | string | Model)[];
-        field: DeepFKField;
-        multiple?: boolean;
-    }>();
+    const props = withDefaults(
+        defineProps<{
+            value: (number | string | Model)[];
+            field: DeepFKField;
+            multiple?: boolean;
+            minItems?: number;
+            maxItems?: number;
+        }>(),
+        {
+            minItems: 0,
+            maxItems: Number.POSITIVE_INFINITY,
+        },
+    );
     const emit = defineEmits<{
         (e: 'update:value', value: (number | string | Model)[], options?: SetFieldValueParams): void;
     }>();
 
-    const onlyLastChild = computed(() => props.field.onlyLastChild);
     const initialized = ref(false);
     const tree = ref();
     const treeData = shallowRef<any[]>([]);
@@ -131,10 +138,16 @@
                 const selection = tree.value.find((node: any) => String(node.id) === nodeElId);
                 const node = selection[0];
                 if (node) {
-                    if (props.value.some((item) => props.field.getValueFieldValue(item) === node.id)) {
+                    const isAlreadySelected = props.value.some(
+                        (item) => props.field.getValueFieldValue(item) === node.id,
+                    );
+                    if (isAlreadySelected) {
                         node.unselect();
-                    } else {
+                        return;
+                    }
+                    if (props.value.length < props.maxItems) {
                         node.select(props.multiple);
+                        return;
                     }
                 }
             }
@@ -145,9 +158,6 @@
         if (!initialized.value) {
             return;
         }
-        if (onlyLastChild.value && node.children.length) {
-            return;
-        }
         updateValue(node.tree.selectedNodes.map((node: any) => node.data.instance));
     }
 
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 2c372499..82de12a0 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b19'
+__version__: str = '5.10.0b20'
diff --git a/vstutils/api/schema/views.py b/vstutils/api/schema/views.py
index 288a1ceb..fa8aa295 100644
--- a/vstutils/api/schema/views.py
+++ b/vstutils/api/schema/views.py
@@ -1,6 +1,7 @@
 import hashlib
 
 from django.conf import settings
+from django.utils.cache import patch_cache_control
 from drf_yasg.views import get_schema_view
 from rest_framework import permissions, versioning
 from vstutils.utils import check_request_etag
@@ -12,6 +13,11 @@ class OpenApiView(get_schema_view()):  # type: ignore
     permission_classes = (permissions.AllowAny,)
     versioning_class = versioning.NamespaceVersioning
 
+    @classmethod
+    def as_cached_view(cls, cache_timeout=0, cache_kwargs=None, **initkwargs):
+        # Just return normal view and skip all caching, instead ETag based http cache is used
+        return cls.as_view(**initkwargs)
+
     def get_etag_dependencies(self, request):
         dependencies = [settings.FULL_VERSION]
         if request.user.is_authenticated:
@@ -38,4 +44,6 @@ def finalize_response(self, request, response, *args, **kwargs):
         response = super().finalize_response(request, response, *args, **kwargs)
         if etag_value := getattr(self, 'etag_value', None):
             response['Etag'] = etag_value
+            patch_cache_control(response, no_cache=True, must_revalidate=True, private=True)
+            response.headers['Vary'] = 'Accept'
         return response

From 07019cf9543da7a1737e8056349da452869fdc31 Mon Sep 17 00:00:00 2001
From: Dmitriy Ovcharenko <ovcharenkodd@gmail.com>
Date: Thu, 25 Jul 2024 07:13:35 +1000
Subject: [PATCH 35/46] Feature(frontend): Rollup types (create typing files
 only for entry points).

---
 .gitlab-ci.yml                                |  2 +-
 .npmignore                                    |  6 --
 frontend_src/README.md                        | 43 ++++++++++
 frontend_src/__tests__/startapp.test.ts       |  2 +-
 frontend_src/app.common.js                    |  2 +-
 frontend_src/build-package.ts                 | 38 +++++++++
 frontend_src/libs/auto-complete.js            |  3 +
 frontend_src/libs/vue.js                      |  5 +-
 frontend_src/shims-vue-global.d.ts            |  8 +-
 frontend_src/tsconfig.json                    |  5 +-
 frontend_src/unittests/create-app.ts          |  8 +-
 frontend_src/unittests/index.ts               |  2 +-
 frontend_src/unittests/open-page.ts           |  4 +-
 frontend_src/unittests/schema.ts              |  2 +-
 frontend_src/vite.config.ts                   |  6 +-
 frontend_src/vstutils/ComponentIDMixin.js     |  2 +-
 frontend_src/vstutils/OpenAPILoader.ts        |  2 +-
 .../AggregatedQueriesExecutor.test.js         |  2 +-
 .../vstutils/__tests__/actions.test.js        |  2 +-
 .../vstutils/__tests__/composables.test.js    |  6 +-
 .../__tests__/selected-filters.test.js        |  2 +-
 frontend_src/vstutils/actions.ts              |  2 +-
 .../additionalProperties/AddKeyField.vue      |  8 +-
 .../additionalProperties/EditKeyField.vue     |  8 +-
 .../vstutils/additionalProperties/index.ts    |  4 +-
 frontend_src/vstutils/api-fetch.ts            |  2 +-
 frontend_src/vstutils/api/ApiConnector.ts     |  6 +-
 .../vstutils/api/TranslationsManager.ts       |  4 +-
 frontend_src/vstutils/app.ts                  | 60 +++++++-------
 .../vstutils/autoupdate/useAutoUpdate.ts      |  2 +-
 frontend_src/vstutils/breadcrumbs.ts          |  2 +-
 .../vstutils/components/BootstrapModal.vue    |  2 +-
 frontend_src/vstutils/components/Card.vue     |  2 +-
 .../vstutils/components/common/AppModals.vue  |  4 +-
 .../components/common/Breadcrumbs.vue         |  2 +-
 .../vstutils/components/common/ButtonsRow.vue |  2 +-
 .../vstutils/components/common/EntityView.vue |  8 +-
 .../components/items/ControlSidebar.vue       | 10 +--
 .../components/items/modal/HelpModal.vue      |  2 +-
 .../vstutils/components/list/AddChild.vue     | 20 ++---
 .../components/list/AddChildModal.vue         |  4 +-
 .../vstutils/components/list/FiltersModal.vue |  8 +-
 .../vstutils/components/list/ListTable.vue    |  2 +-
 .../components/list/ListViewComponent.vue     |  6 +-
 .../list/NotEmptyMultiactionModal.vue         | 14 ++--
 .../vstutils/components/list/Pagination.vue   |  2 +-
 .../vstutils/components/page/DefaultView.vue  |  8 +-
 .../components/page/FiltersModalDetail.vue    | 12 +--
 .../components/page/HideNotRequiredSelect.vue |  4 +-
 .../vstutils/components/page/ModelFields.vue  | 10 +--
 .../vstutils/components/page/OneEntity.vue    |  4 +-
 .../components/page/tabbed/SteppedView.vue    |  6 +-
 .../components/page/tabbed/TabbedDetail.vue   |  2 +-
 .../vstutils/components/page/tabbed/state.ts  | 10 +--
 .../components/wysiwyg-editor/index.ts        |  4 +-
 frontend_src/vstutils/composables.ts          |  6 +-
 .../vstutils/default-auth-app/helpers.ts      |  2 +-
 .../vstutils/default-auth-app/index.ts        |  2 +-
 .../pages/RegistrationConfirmEmail.vue        |  2 +-
 frontend_src/vstutils/fetch-values.ts         | 22 ++---
 .../fields-container-classes.test.ts          |  6 +-
 .../vstutils/fields/array/ArrayField.ts       |  8 +-
 .../vstutils/fields/array/ArrayFieldEdit.vue  |  2 +-
 frontend_src/vstutils/fields/array/mixins.ts  |  6 +-
 .../AutocompleteFieldContentEditMixin.vue     |  2 +-
 .../fields/autocomplete/composables.ts        |  3 +-
 .../fields/barcode/Barcode128Field.ts         |  8 +-
 .../barcode/BarcodeFieldContentEdit.vue       |  8 +-
 .../vstutils/fields/barcode/QRCodeField.ts    |  8 +-
 .../vstutils/fields/barcode/ScannerCamera.vue |  2 +-
 .../barcode/__tests__/barcode-fields.test.ts  |  6 +-
 frontend_src/vstutils/fields/barcode/base.ts  |  2 +-
 .../vstutils/fields/base/BaseField.ts         |  5 +-
 .../vstutils/fields/base/BaseFieldLabel.vue   |  4 +-
 frontend_src/vstutils/fields/base/Field.ts    |  4 +-
 frontend_src/vstutils/fields/base/props.ts    |  2 +-
 frontend_src/vstutils/fields/base/types.ts    |  2 +-
 .../fields/camera-select/CameraSelectField.ts |  6 +-
 .../fields/choices/ChoicesArrayFieldEdit.vue  |  8 +-
 .../vstutils/fields/choices/ChoicesField.ts   |  8 +-
 .../choices/ChoicesFieldContentEdit.vue       |  8 +-
 .../fields/choices/OrderingChoicesField.ts    |  2 +-
 frontend_src/vstutils/fields/choices/array.ts |  2 +-
 .../crontab/CrontabFieldContentEdit.vue       |  6 +-
 .../datetime/__tests__/DateTimeField.test.js  |  2 +-
 .../fields/dynamic/DependFromFkField.ts       |  2 +-
 .../fields/dynamic/DependFromFkFieldMixin.vue |  2 +-
 .../vstutils/fields/dynamic/DynamicField.ts   | 12 +--
 .../fields/dynamic/DynamicFieldMixin.vue      |  8 +-
 .../__tests__/DependFromFkField.test.js       |  2 +-
 .../dynamic/__tests__/DynamicField.test.js    | 10 +--
 .../dynamic/__tests__/DynamicField.test.ts    |  4 +-
 .../__tests__/depend-on-parent-view.test.js   |  6 +-
 .../vstutils/fields/files/FileInput.vue       |  4 +-
 .../vstutils/fields/files/FileNamesEditor.vue |  4 +-
 .../vstutils/fields/files/FileRenameInput.vue |  2 +-
 .../fields/files/__tests__/files.test.js      |  4 +-
 .../files/binary-file/BinaryFileField.ts      |  4 +-
 .../files/csv-file/CSVFileFieldEdit.vue       | 10 +--
 .../files/csv-file/CsvFileFieldReadonly.vue   |  2 +-
 .../fields/files/csv-file/DataTable.vue       | 14 ++--
 .../files/csv-file/__tests__/csv-file.test.js |  4 +-
 .../vstutils/fields/files/csv-file/index.ts   | 18 ++--
 .../vstutils/fields/files/file/FileField.ts   |  4 +-
 .../fields/files/file/FileFieldButtonMixin.ts |  2 +-
 .../files/file/FileFieldContentEdit.vue       |  2 +-
 .../fields/files/file/FileFieldMixin.ts       |  4 +-
 .../vstutils/fields/files/file/utils.ts       |  4 +-
 frontend_src/vstutils/fields/files/index.ts   | 24 ++++--
 .../multiple-named-binary-file/FilesList.vue  |  2 +-
 .../MultipleNamedBinaryFileField.ts           | 10 +--
 ...ultipleNamedBinaryFileFieldContentEdit.vue |  8 +-
 ...ultipleNamedBinaryFileFieldContentList.vue |  6 +-
 ...pleNamedBinaryFileFieldContentReadonly.vue |  4 +-
 .../MultipleNamedBinaryFileFieldMixin.ts      |  2 +-
 .../multiple-named-binary-image/Carousel.vue  |  4 +-
 .../MultipleNamedBinaryImageField.ts          |  2 +-
 ...ltipleNamedBinaryImageFieldContentEdit.vue |  6 +-
 ...leNamedBinaryImageFieldContentReadonly.vue |  4 +-
 .../MultipleNamedBinaryImageFieldListView.vue |  6 +-
 .../MultipleNamedBinaryImageFieldMixin.ts     |  2 +-
 .../named-binary-file/NamedBinaryFileField.ts | 10 +--
 .../NamedBinaryFileFieldContentEdit.vue       |  6 +-
 .../NamedBinaryFileFieldMixin.ts              |  2 +-
 .../NamedBinaryFileFieldReadonly.vue          |  4 +-
 .../fields/files/named-binary-file/utils.ts   |  6 +-
 .../files/named-binary-image/ImageBlock.vue   |  8 +-
 .../NamedBinaryImageFieldContentEdit.vue      |  4 +-
 .../NamedBinaryImageFieldContentReadonly.vue  |  2 +-
 .../NamedBinaryImageFieldMixin.ts             |  2 +-
 .../ResolutionValidatorImage.vue              |  6 +-
 .../ResolutionValidatorModal.vue              |  4 +-
 .../useResolutionValidator.ts                 |  6 +-
 .../fields/fk/__tests__/DeepFKField.test.js   |  2 +-
 .../fk/autocomplete/FKAutocompleteField.ts    |  4 +-
 .../FKAutocompleteFieldContentEdit.vue        | 18 ++--
 .../fk/deep-fk/DeepFKFieldContentEditable.vue |  2 +-
 .../fk/deep-fk/DeepFkArrayFieldEdit.vue       |  2 +-
 .../vstutils/fields/fk/deep-fk/FkTree.vue     |  4 +-
 .../vstutils/fields/fk/deep-fk/array.ts       |  2 +-
 frontend_src/vstutils/fields/fk/fk/FKField.ts | 22 ++---
 .../vstutils/fields/fk/fk/FKFieldContent.js   |  2 +-
 .../fields/fk/fk/FKFieldContentEditable.vue   |  8 +-
 .../fields/fk/fk/FKFieldContentReadonly.vue   |  8 +-
 .../vstutils/fields/fk/fk/FKFieldMixin.ts     |  2 +-
 .../fk/__tests__/FKField-value-fetch.test.js  |  4 +-
 .../not-available-fk-model-selected.test.js   |  2 +-
 frontend_src/vstutils/fields/fk/fk/array.ts   | 16 ++--
 .../vstutils/fields/fk/fk/composables.ts      |  4 +-
 .../vstutils/fields/fk/fk/transport.ts        | 10 +--
 frontend_src/vstutils/fields/hidden.ts        |  4 +-
 .../vstutils/fields/json/JSONField.ts         |  6 +-
 .../NestedObjectArrayFieldEdit.vue            | 16 ++--
 .../vstutils/fields/nested-object/array.ts    |  2 +-
 .../vstutils/fields/nested-object/index.ts    | 16 ++--
 frontend_src/vstutils/fields/numbers/array.ts |  2 +-
 .../vstutils/fields/related-list/index.ts     | 12 +--
 frontend_src/vstutils/fields/static-value.ts  |  6 +-
 .../vstutils/fields/text/FieldTextarea.vue    |  4 +-
 .../fields/text/HTMLFieldContentReadonly.vue  |  2 +-
 .../fields/text/StringArrayFieldListView.vue  |  2 +-
 .../vstutils/fields/text/TextAreaField.ts     |  4 +-
 .../fields/text/TextAreaFieldContentEdit.vue  |  4 +-
 .../text/TextAreaFieldContentReadonly.vue     |  2 +-
 .../fields/text/TextParagraphField.ts         |  4 +-
 .../TextParagraphFieldContentReadonly.vue     |  2 +-
 frontend_src/vstutils/fields/text/URIField.ts | 10 +--
 .../vstutils/fields/text/WYSIWYGField.ts      |  4 +-
 .../fields/text/__tests__/phone-field.test.ts |  2 +-
 frontend_src/vstutils/fields/text/index.ts    |  9 +-
 .../vstutils/fields/text/string-array.ts      | 10 +--
 frontend_src/vstutils/fields/validation.js    |  2 +-
 frontend_src/vstutils/init-app.ts             | 10 +--
 .../vstutils/local-settings/scanner-camera.ts |  4 +-
 frontend_src/vstutils/models/Model.ts         |  6 +-
 .../vstutils/models/ModelsResolver.ts         | 12 +--
 .../__tests__/additionalProperties.test.ts    |  6 +-
 .../data-based-fields-visibility.test.ts      |  2 +-
 .../vstutils/models/__tests__/errors.test.js  |  2 +-
 .../__tests__/models-generation.test.ts       |  4 +-
 .../readonly-fields-validation.test.ts        |  2 +-
 frontend_src/vstutils/models/errors.ts        |  6 +-
 frontend_src/vstutils/models/index.ts         |  2 +-
 frontend_src/vstutils/models/sandbox.ts       |  8 +-
 frontend_src/vstutils/models/utils.ts         |  2 +-
 frontend_src/vstutils/page-loader/index.js    |  4 +-
 frontend_src/vstutils/popUp/ErrorHandler.js   |  2 +-
 frontend_src/vstutils/popUp/PopUp.js          |  6 +-
 .../popUp/__tests__/ErrorHandler.test.js      |  2 +-
 frontend_src/vstutils/querySet/QuerySet.ts    | 18 ++--
 .../vstutils/querySet/QuerySetsResolver.js    |  2 +-
 .../__tests__/QuerySet-prefetch.test.js       |  4 +-
 .../querySet/__tests__/QuerySet.test.js       |  2 +-
 .../__tests__/entity-update-race.test.ts      |  8 +-
 .../querySet/__tests__/fetch-values.test.js   |  6 +-
 .../vstutils/router/RouterConstructor.ts      |  4 +-
 .../vstutils/router/customPages/NotFound.vue  |  2 +-
 frontend_src/vstutils/signals.ts              | 10 +--
 .../store/__tests__/actionViewStore.test.js   |  2 +-
 .../store/__tests__/custom-title.test.js      |  2 +-
 .../store/__tests__/deep-nested.test.js       |  2 +-
 .../store/__tests__/detailPage.test.js        |  2 +-
 .../store/__tests__/detailPageFilters.test.js |  2 +-
 .../store/__tests__/localSettings.test.js     |  6 +-
 .../vstutils/store/__tests__/modules.test.js  |  2 +-
 .../vstutils/store/__tests__/page.test.js     |  2 +-
 .../prefetch-with-provided-instance.test.js   |  4 +-
 .../store/__tests__/useParentViews.test.js    |  4 +-
 frontend_src/vstutils/store/globalStore.ts    |  2 +-
 frontend_src/vstutils/store/helpers.ts        | 22 ++---
 .../vstutils/store/localSettingsStore.ts      |  6 +-
 frontend_src/vstutils/store/page-types.ts     | 10 +--
 frontend_src/vstutils/store/page.ts           | 21 ++---
 .../vstutils/store/userSettingsStore.ts       | 12 +--
 frontend_src/vstutils/translation.ts          | 59 ++++++-------
 frontend_src/vstutils/users/Gravatar.ts       |  2 +-
 frontend_src/vstutils/users/TFAPage.vue       | 20 +++--
 frontend_src/vstutils/users/index.js          |  4 +-
 frontend_src/vstutils/users/settings.js       |  2 +-
 .../vstutils/utils/__tests__/utils.test.js    |  4 +-
 frontend_src/vstutils/utils/app-helpers.ts    |  2 +-
 frontend_src/vstutils/utils/index.ts          | 16 ++--
 frontend_src/vstutils/utils/localSettings.js  |  2 +-
 frontend_src/vstutils/utils/todo.js           | 12 +--
 frontend_src/vstutils/views/View.ts           | 22 ++---
 .../vstutils/views/ViewConstructor.js         | 10 +--
 frontend_src/vstutils/views/ViewsTree.js      |  6 +-
 .../views/__tests__/ViewConstructor.test.js   |  2 +-
 .../__tests__/actions-generation.test.js      |  4 +-
 .../views/__tests__/file-responses.test.js    |  4 +-
 .../views/__tests__/hidden-views.test.js      |  4 +-
 .../__tests__/main-action-execution.test.ts   |  2 +-
 frontend_src/vstutils/views/openapi.ts        | 19 +++--
 frontend_src/vstutils/webpush.ts              | 14 ++--
 package.json                                  | 23 +++---
 test_src/test_proj/tests.py                   | 69 +++++++---------
 vstutils/__init__.py                          |  2 +-
 vstutils/management/commands/newproject.py    | 15 ++--
 .../templates/newproject/.gitignore.template  |  2 +
 .../frontend_src/.babelrc.js.template         |  6 --
 .../frontend_src/.editorconfig.template       |  5 +-
 .../frontend_src/.eslintrc.js.template        | 28 -------
 .../frontend_src/.prettierrc.template         | 19 +----
 .../frontend_src/app/index.js.template        |  0
 .../frontend_src/index.html.template          | 14 ++++
 .../newproject/frontend_src/index.ts.template |  7 ++
 .../frontend_src/tsconfig.json.template       | 25 ++++++
 .../frontend_src/vite.config.ts.template      | 26 ++++++
 .../newproject/package.json.default.template  | 30 +++++++
 .../newproject/package.json.template          | 36 --------
 .../project_name/settings.py.template         | 15 ----
 .../webpack.config.js.default.template        | 82 -------------------
 yarn.lock                                     | 24 +++++-
 253 files changed, 985 insertions(+), 947 deletions(-)
 delete mode 100644 .npmignore
 create mode 100644 frontend_src/README.md
 create mode 100644 frontend_src/build-package.ts
 delete mode 100644 vstutils/templates/newproject/frontend_src/.babelrc.js.template
 delete mode 100644 vstutils/templates/newproject/frontend_src/.eslintrc.js.template
 delete mode 100644 vstutils/templates/newproject/frontend_src/app/index.js.template
 create mode 100644 vstutils/templates/newproject/frontend_src/index.html.template
 create mode 100644 vstutils/templates/newproject/frontend_src/index.ts.template
 create mode 100644 vstutils/templates/newproject/frontend_src/tsconfig.json.template
 create mode 100644 vstutils/templates/newproject/frontend_src/vite.config.ts.template
 create mode 100644 vstutils/templates/newproject/package.json.default.template
 delete mode 100644 vstutils/templates/newproject/package.json.template
 delete mode 100644 vstutils/templates/newproject/webpack.config.js.default.template

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ff0dbdf..2eec59a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -146,7 +146,7 @@ release_packages:
       VERSION=$(grep "__version__" vstutils/__init__.py | sed -E "s/__version__: str = '(.+)'/\1/")
       sed -i -E "s/\"version\": \"[^\"]+\"/\"version\": \"$VERSION\"/" package.json
     - yarn build-lib
-    - cp -v README.rst dist/README.rst
+    - cd dist
     - echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}'>.npmrc
     - npm publish --access public
   allow_failure: true
diff --git a/.npmignore b/.npmignore
deleted file mode 100644
index 8c2cc9c3..00000000
--- a/.npmignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# Ignore all files
-*
-
-# Include the content of the dist directory
-!dist/
-!dist/**
diff --git a/frontend_src/README.md b/frontend_src/README.md
new file mode 100644
index 00000000..cfd36a31
--- /dev/null
+++ b/frontend_src/README.md
@@ -0,0 +1,43 @@
+# VSTUtils Framework
+
+A platform for easy web application generation (PWA/Progressive Web
+Application and SPA/Single Page Application). It uses OpenAPI (Swagger
+2.0) schema for GUI rendering based over the REST API and also provides
+the ability to generate documentation for the API based on the schema.
+By default GUI based on AdminLTE dashboard and Vue templates.
+
+Review a special section in the documentation for a QuickStart
+development - <https://vstutils.vstconsulting.net/quickstart.html>.
+
+[![License](https://img.shields.io/github/license/vstconsulting/vstutils.svg)](https://github.com/vstconsulting/vstutils/blob/master/LICENSE)
+
+![NPM -  Version](https://img.shields.io/npm/v/%40vstconsulting%2Fvstutils?color=green)
+
+![NPM - Downloads](https://img.shields.io/npm/dm/%40vstconsulting%2Fvstutils)
+
+[![Documentation Status](https://readthedocs.org/projects/vstutils/badge/?version=latest)](https://vstutils.vstconsulting.net/en/latest/?badge=latest)
+
+## Development Status
+
+[![Pipeline status](https://gitlab.com/vstconsulting/vstutils/badges/master/pipeline.svg)](https://gitlab.com/vstconsulting/vstutils/commits/master)
+
+[![Coverage report](https://gitlab.com/vstconsulting/vstutils/badges/master/coverage.svg)](https://gitlab.com/vstconsulting/vstutils/pipelines)
+
+![PyPI - Django Version](https://img.shields.io/pypi/djversions/vstutils?color=green)
+
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/vstutils?color=green)](https://pypi.org/project/vstutils/)
+
+[![GitHub last commit](https://img.shields.io/github/last-commit/vstconsulting/vstutils)](https://github.com/vstconsulting/vstutils/commits/master)
+
+### Implemented Projects
+
+-   Polemarch (<https://polemarch.org/>)
+-   SkillsChecked (Nurse recruitment app).
+-   Deigmata (Marketplace platform).
+
+### License
+
+VSTUtils is licensed under the terms of the Apache License 2.0. See the
+file \"LICENSE\" for more information.
+
+Copyright 2018-2024 VST Consulting
diff --git a/frontend_src/__tests__/startapp.test.ts b/frontend_src/__tests__/startapp.test.ts
index 5792912d..c8869e0a 100644
--- a/frontend_src/__tests__/startapp.test.ts
+++ b/frontend_src/__tests__/startapp.test.ts
@@ -1,5 +1,5 @@
 import { waitFor } from '@testing-library/dom';
-import { createApp, useTestCtx } from '@/unittests';
+import { createApp, useTestCtx } from '#unittests';
 
 describe('App', () => {
     test('Create and init', async () => {
diff --git a/frontend_src/app.common.js b/frontend_src/app.common.js
index c64712d0..61a92db8 100644
--- a/frontend_src/app.common.js
+++ b/frontend_src/app.common.js
@@ -38,7 +38,7 @@ import iziToast from 'izitoast';
 import 'izitoast/dist/css/iziToast.css';
 window.iziToast = iziToast;
 
-import autoComplete from '@/libs/auto-complete.js';
+import autoComplete from '#libs/auto-complete.js';
 window.autoComplete = autoComplete;
 
 import './libs/bootstrap-adminlte.js';
diff --git a/frontend_src/build-package.ts b/frontend_src/build-package.ts
new file mode 100644
index 00000000..7080915c
--- /dev/null
+++ b/frontend_src/build-package.ts
@@ -0,0 +1,38 @@
+import { cp, writeFile } from 'node:fs/promises';
+import { join, format, parse } from 'node:path';
+import { build } from 'vite';
+import config, { frontendSrc, dist } from './vite.config';
+import packageJson from '../package.json';
+
+await build(config({ command: 'build', mode: 'production' }));
+await Promise.all([
+    cp(join(frontendSrc, '..', 'LICENSE'), join(dist, 'LICENSE')),
+    cp(join(frontendSrc, '..', 'NOTICE'), join(dist, 'NOTICE')),
+    cp(join(frontendSrc, 'README.md'), join(dist, 'README.md')),
+    copyPackageJsonWithAdjustedPaths(dist),
+]);
+
+async function copyPackageJsonWithAdjustedPaths(outDir: string) {
+    const packageCopy = {
+        ...packageJson,
+        exports: {} as Record<string, any>,
+    };
+
+    for (const [key, value] of Object.entries(packageJson.exports)) {
+        packageCopy.exports[key] = transformExportValue(value);
+    }
+
+    function transformExportValue(pathStr: string) {
+        const path = parse(pathStr);
+
+        if (path.ext === '.ts') {
+            return {
+                import: format({ dir: '.', name: path.name, ext: '.js' }),
+                types: format({ dir: '.', name: path.name, ext: '.d.ts' }),
+            };
+        }
+        return format({ dir: '.', name: path.name, ext: path.ext });
+    }
+
+    await writeFile(join(outDir, 'package.json'), JSON.stringify(packageCopy, undefined, 2));
+}
diff --git a/frontend_src/libs/auto-complete.js b/frontend_src/libs/auto-complete.js
index 96d63e8b..431f5241 100644
--- a/frontend_src/libs/auto-complete.js
+++ b/frontend_src/libs/auto-complete.js
@@ -7,6 +7,9 @@
     License: http://www.opensource.org/licenses/mit-license.php
 */
 
+/**
+ * @type {new (params: any) => any}
+ */
 var autoComplete = (function () {
     // "use strict";
     function autoComplete(options) {
diff --git a/frontend_src/libs/vue.js b/frontend_src/libs/vue.js
index 9bc911eb..68d36e5a 100644
--- a/frontend_src/libs/vue.js
+++ b/frontend_src/libs/vue.js
@@ -1,8 +1,5 @@
 import Vue from 'vue';
 
-import VueI18n from 'vue-i18n';
-window.VueI18n = VueI18n;
-
 import * as pinia from 'pinia';
 window.pinia = pinia;
 Vue.use(pinia.PiniaVuePlugin);
@@ -19,4 +16,4 @@ Vue.directive('element-bound', {
 
 Vue.config.productionTip = false;
 
-export { Vue, VueI18n, PortalVue };
+export { Vue, PortalVue };
diff --git a/frontend_src/shims-vue-global.d.ts b/frontend_src/shims-vue-global.d.ts
index a8e3136e..38dba856 100644
--- a/frontend_src/shims-vue-global.d.ts
+++ b/frontend_src/shims-vue-global.d.ts
@@ -1,12 +1,12 @@
 import type { IAppInitialized } from './vstutils/app';
-import type * as utils from '@/vstutils/utils';
-import type VueI18n from 'vue-i18n';
+import type * as utils from '#vstutils/utils';
+import type { CustomVueI18n } from './vstutils/translation';
 
 declare module 'vue/types/vue' {
     interface Vue {
         $app: IAppInitialized;
-        $st: VueI18n['st'];
-        $ts: VueI18n['ts'];
+        $st: CustomVueI18n['st'];
+        $ts: CustomVueI18n['ts'];
         $u: typeof utils;
     }
 }
diff --git a/frontend_src/tsconfig.json b/frontend_src/tsconfig.json
index bce6d64a..f9c732b9 100644
--- a/frontend_src/tsconfig.json
+++ b/frontend_src/tsconfig.json
@@ -23,7 +23,10 @@
             "bootstrap",
         ],
         "paths": {
-            "@/*": ["./*"]
+            "#vstutils/*": ["./vstutils/*"],
+            "#libs/*": ["./libs/*"],
+            "#unittests/*": ["./unittests/*"],
+            "#unittests": ["./unittests"],
         }
     },
     "vueCompilerOptions": {
diff --git a/frontend_src/unittests/create-app.ts b/frontend_src/unittests/create-app.ts
index e803ae0a..1ee67edb 100644
--- a/frontend_src/unittests/create-app.ts
+++ b/frontend_src/unittests/create-app.ts
@@ -1,13 +1,13 @@
 import { User } from 'oidc-client-ts';
 import { createLocalVue } from '@vue/test-utils';
 import VueI18n from 'vue-i18n';
-import { type AppSchema } from '@/vstutils/schema';
-import { type InitAppConfigRaw, _createUserManager, type UserProfile } from '@/vstutils/init-app';
-import { getApp } from '@/vstutils/utils';
+import { type AppSchema } from '#vstutils/schema';
+import { type InitAppConfigRaw, _createUserManager, type UserProfile } from '#vstutils/init-app';
+import { getApp } from '#vstutils/utils';
 import testSchema from '../__mocks__/testSchema.json';
 
 // Important to import from index to trigger side effects as if it was a real app
-import { initApp } from '@/index';
+import { initApp } from '../index';
 
 export async function createApp(params?: { schema?: Partial<AppSchema>; disableBulk?: boolean }) {
     // Remove old app
diff --git a/frontend_src/unittests/index.ts b/frontend_src/unittests/index.ts
index 0f458aab..17035d0e 100644
--- a/frontend_src/unittests/index.ts
+++ b/frontend_src/unittests/index.ts
@@ -1,7 +1,7 @@
 import { mount as vueMount, createWrapper, type Wrapper } from '@vue/test-utils';
 import { waitFor as _waitFor, within } from '@testing-library/dom';
 import userEvent from '@testing-library/user-event';
-import { getApp } from '@/vstutils/utils';
+import { getApp } from '#vstutils/utils';
 
 import type { ComponentOptions } from 'vue';
 
diff --git a/frontend_src/unittests/open-page.ts b/frontend_src/unittests/open-page.ts
index 6704a12d..37d32ebb 100644
--- a/frontend_src/unittests/open-page.ts
+++ b/frontend_src/unittests/open-page.ts
@@ -1,7 +1,7 @@
 import { effectScope } from 'vue';
 import { isNavigationFailure, NavigationFailureType } from 'vue-router';
-import { getApp, NOT_FOUND_ROUTE_NAME } from '@/vstutils/utils';
-import type { IView } from '@/vstutils/views';
+import { getApp, NOT_FOUND_ROUTE_NAME } from '#vstutils/utils';
+import type { IView } from '#vstutils/views';
 import type { RawLocation } from 'vue-router';
 
 export async function openPage(to: RawLocation) {
diff --git a/frontend_src/unittests/schema.ts b/frontend_src/unittests/schema.ts
index 60ad4a8b..6da68be7 100644
--- a/frontend_src/unittests/schema.ts
+++ b/frontend_src/unittests/schema.ts
@@ -1,4 +1,4 @@
-import type { AppSchema } from '@/vstutils/schema';
+import type { AppSchema } from '#vstutils/schema';
 import { mergeDeep } from '../vstutils/utils';
 import simpleSchema from './simple-schema.json';
 
diff --git a/frontend_src/vite.config.ts b/frontend_src/vite.config.ts
index 5a05dbaa..e08427da 100644
--- a/frontend_src/vite.config.ts
+++ b/frontend_src/vite.config.ts
@@ -7,7 +7,8 @@ import tsconfigPaths from 'vite-tsconfig-paths';
 
 const currentDir = dirname(fileURLToPath(import.meta.url));
 
-const frontendSrc = currentDir;
+export const frontendSrc = currentDir;
+export const dist = join(frontendSrc, '..', 'dist');
 
 export default defineConfig(() => ({
     plugins: [
@@ -17,6 +18,7 @@ export default defineConfig(() => ({
             insertTypesEntry: true,
             exclude: ['**/__tests__', '**/*.test.ts', '**/dist', 'unittests', '**/vite.config.ts'],
             tsconfigPath: join(frontendSrc, 'tsconfig.json'),
+            rollupTypes: true,
         }),
     ],
     build: {
@@ -30,6 +32,8 @@ export default defineConfig(() => ({
         rollupOptions: {
             external: ['vue', /@toast-ui\/vue-editor/, /@toast-ui\/editor/],
         },
+        outDir: dist,
+        emptyOutDir: true,
     },
     resolve: {
         alias: {
diff --git a/frontend_src/vstutils/ComponentIDMixin.js b/frontend_src/vstutils/ComponentIDMixin.js
index f9b153fb..89c437fb 100644
--- a/frontend_src/vstutils/ComponentIDMixin.js
+++ b/frontend_src/vstutils/ComponentIDMixin.js
@@ -1,4 +1,4 @@
-import { createUniqueIdGenerator } from '@/vstutils/utils';
+import { createUniqueIdGenerator } from '#vstutils/utils';
 
 const DEFAULT_GENERATOR = createUniqueIdGenerator();
 
diff --git a/frontend_src/vstutils/OpenAPILoader.ts b/frontend_src/vstutils/OpenAPILoader.ts
index 6be7ef62..97a95e9e 100644
--- a/frontend_src/vstutils/OpenAPILoader.ts
+++ b/frontend_src/vstutils/OpenAPILoader.ts
@@ -1,4 +1,4 @@
-import { createApiFetch } from '@/vstutils/api-fetch';
+import { createApiFetch } from '#vstutils/api-fetch';
 import { InitAppConfig } from './init-app';
 import { type AppSchema } from './schema';
 
diff --git a/frontend_src/vstutils/__tests__/AggregatedQueriesExecutor.test.js b/frontend_src/vstutils/__tests__/AggregatedQueriesExecutor.test.js
index 71d77535..98c1ed58 100644
--- a/frontend_src/vstutils/__tests__/AggregatedQueriesExecutor.test.js
+++ b/frontend_src/vstutils/__tests__/AggregatedQueriesExecutor.test.js
@@ -1,4 +1,4 @@
-import { createSchema, createApp } from '@/unittests';
+import { createSchema, createApp } from '#unittests';
 import { makeModel, BaseModel } from '../models';
 import { QuerySet } from '../querySet/QuerySet.ts';
 import { StringField } from '../fields/text/';
diff --git a/frontend_src/vstutils/__tests__/actions.test.js b/frontend_src/vstutils/__tests__/actions.test.js
index f6db2639..b3483e96 100644
--- a/frontend_src/vstutils/__tests__/actions.test.js
+++ b/frontend_src/vstutils/__tests__/actions.test.js
@@ -1,4 +1,4 @@
-import { expectNthRequest, createApp } from '@/unittests';
+import { expectNthRequest, createApp } from '#unittests';
 
 describe('Actions', () => {
     /** @type {App} */
diff --git a/frontend_src/vstutils/__tests__/composables.test.js b/frontend_src/vstutils/__tests__/composables.test.js
index 8fc114bd..cb595602 100644
--- a/frontend_src/vstutils/__tests__/composables.test.js
+++ b/frontend_src/vstutils/__tests__/composables.test.js
@@ -1,8 +1,8 @@
 import { reactive, computed } from 'vue';
-import { createApp } from '@/unittests';
-import { StringField } from '@/vstutils/fields/text';
+import { createApp } from '#unittests';
+import { StringField } from '#vstutils/fields/text';
 
-import { getModelFieldsInstancesGroups, useHideableFieldsGroups } from '@/vstutils/composables';
+import { getModelFieldsInstancesGroups, useHideableFieldsGroups } from '#vstutils/composables';
 
 let app;
 
diff --git a/frontend_src/vstutils/__tests__/selected-filters.test.js b/frontend_src/vstutils/__tests__/selected-filters.test.js
index 64b22d6b..cc46cc7c 100644
--- a/frontend_src/vstutils/__tests__/selected-filters.test.js
+++ b/frontend_src/vstutils/__tests__/selected-filters.test.js
@@ -1,4 +1,4 @@
-import { createApp, createSchema, useTestCtx, waitForPageLoading } from '@/unittests';
+import { createApp, createSchema, useTestCtx, waitForPageLoading } from '#unittests';
 
 test('Selected filters', async () => {
     const app = await createApp({ schema: createSchema() });
diff --git a/frontend_src/vstutils/actions.ts b/frontend_src/vstutils/actions.ts
index 08bd7819..cc6b2a3b 100644
--- a/frontend_src/vstutils/actions.ts
+++ b/frontend_src/vstutils/actions.ts
@@ -1,4 +1,4 @@
-import type { IApp, IAppInitialized } from '@/vstutils/app';
+import type { IApp, IAppInitialized } from '#vstutils/app';
 import { guiPopUp, pop_up_msg } from './popUp';
 import { downloadResponse, emptyInnerData } from './utils';
 import {
diff --git a/frontend_src/vstutils/additionalProperties/AddKeyField.vue b/frontend_src/vstutils/additionalProperties/AddKeyField.vue
index af5ac447..48abd8f8 100644
--- a/frontend_src/vstutils/additionalProperties/AddKeyField.vue
+++ b/frontend_src/vstutils/additionalProperties/AddKeyField.vue
@@ -12,10 +12,10 @@
 </template>
 
 <script setup lang="ts">
-    import type { FieldLabelEmitsDefType, FieldLabelPropsDefType } from '@/vstutils/fields/base';
-    import { FieldLabelEmitsDef } from '@/vstutils/fields/base';
-    import { BaseFieldLabel } from '@/vstutils/fields/base';
-    import { FieldLabelPropsDef } from '@/vstutils/fields/base';
+    import type { FieldLabelEmitsDefType, FieldLabelPropsDefType } from '#vstutils/fields/base';
+    import { FieldLabelEmitsDef } from '#vstutils/fields/base';
+    import { BaseFieldLabel } from '#vstutils/fields/base';
+    import { FieldLabelPropsDef } from '#vstutils/fields/base';
     import { ref } from 'vue';
 
     defineProps(FieldLabelPropsDef as FieldLabelPropsDefType);
diff --git a/frontend_src/vstutils/additionalProperties/EditKeyField.vue b/frontend_src/vstutils/additionalProperties/EditKeyField.vue
index c7303293..8e1ee409 100644
--- a/frontend_src/vstutils/additionalProperties/EditKeyField.vue
+++ b/frontend_src/vstutils/additionalProperties/EditKeyField.vue
@@ -12,10 +12,10 @@
 </template>
 
 <script setup lang="ts">
-    import type { FieldLabelEmitsDefType, FieldLabelPropsDefType } from '@/vstutils/fields/base';
-    import { FieldLabelEmitsDef } from '@/vstutils/fields/base';
-    import { BaseFieldLabel } from '@/vstutils/fields/base';
-    import { FieldLabelPropsDef } from '@/vstutils/fields/base';
+    import type { FieldLabelEmitsDefType, FieldLabelPropsDefType } from '#vstutils/fields/base';
+    import { FieldLabelEmitsDef } from '#vstutils/fields/base';
+    import { BaseFieldLabel } from '#vstutils/fields/base';
+    import { FieldLabelPropsDef } from '#vstutils/fields/base';
 
     const props = defineProps(FieldLabelPropsDef as FieldLabelPropsDefType);
     const emit = defineEmits(FieldLabelEmitsDef as FieldLabelEmitsDefType);
diff --git a/frontend_src/vstutils/additionalProperties/index.ts b/frontend_src/vstutils/additionalProperties/index.ts
index 1accc2c8..555162c4 100644
--- a/frontend_src/vstutils/additionalProperties/index.ts
+++ b/frontend_src/vstutils/additionalProperties/index.ts
@@ -1,5 +1,5 @@
-import type { ModelConstructor } from '@/vstutils/models';
-import { instantiateFieldFromAnother } from '@/vstutils/models';
+import type { ModelConstructor } from '#vstutils/models';
+import { instantiateFieldFromAnother } from '#vstutils/models';
 import type { DefaultXOptions, ExtractInner, Field, FieldOptions } from '../fields/base';
 import EditKeyField from './EditKeyField.vue';
 
diff --git a/frontend_src/vstutils/api-fetch.ts b/frontend_src/vstutils/api-fetch.ts
index 12a6ebeb..8564bcd4 100644
--- a/frontend_src/vstutils/api-fetch.ts
+++ b/frontend_src/vstutils/api-fetch.ts
@@ -1,4 +1,4 @@
-import type { InitAppConfig } from '@/vstutils/init-app';
+import type { InitAppConfig } from '#vstutils/init-app';
 
 type InternalFetch = (req: Request) => Promise<Response>;
 
diff --git a/frontend_src/vstutils/api/ApiConnector.ts b/frontend_src/vstutils/api/ApiConnector.ts
index 35e14e54..fe8d0901 100644
--- a/frontend_src/vstutils/api/ApiConnector.ts
+++ b/frontend_src/vstutils/api/ApiConnector.ts
@@ -1,6 +1,6 @@
-import type { AppSchema } from '@/vstutils/schema';
-import type { BulkType, HttpMethod, InnerData } from '@/vstutils/utils';
-import { makeQueryString } from '@/vstutils/utils';
+import type { AppSchema } from '#vstutils/schema';
+import type { BulkType, HttpMethod, InnerData } from '#vstutils/utils';
+import { makeQueryString } from '#vstutils/utils';
 import { createApiFetch } from '../api-fetch';
 import { type IApp } from '../app';
 import {
diff --git a/frontend_src/vstutils/api/TranslationsManager.ts b/frontend_src/vstutils/api/TranslationsManager.ts
index c80a2e74..10c13722 100644
--- a/frontend_src/vstutils/api/TranslationsManager.ts
+++ b/frontend_src/vstutils/api/TranslationsManager.ts
@@ -1,6 +1,6 @@
 import type { LocaleMessageObject } from 'vue-i18n';
-import { type InitAppConfig } from '@/vstutils/init-app';
-import { createBulkApiFetch, type BulkApiFetch } from '@/vstutils/bulk';
+import { type InitAppConfig } from '#vstutils/init-app';
+import { createBulkApiFetch, type BulkApiFetch } from '#vstutils/bulk';
 
 export interface Language {
     code: string;
diff --git a/frontend_src/vstutils/app.ts b/frontend_src/vstutils/app.ts
index 60445e37..4260edb2 100644
--- a/frontend_src/vstutils/app.ts
+++ b/frontend_src/vstutils/app.ts
@@ -4,42 +4,42 @@ import Vue from 'vue';
 
 import { Centrifuge } from 'centrifuge';
 import { defineStore } from 'pinia';
-import type VueI18n from 'vue-i18n';
-
-import { ActionsManager } from '@/vstutils/actions';
-import type { ApiConnector } from '@/vstutils/api';
-import { apiConnector } from '@/vstutils/api';
-import type { Language } from '@/vstutils/api/TranslationsManager';
-import { TranslationsManager } from '@/vstutils/api/TranslationsManager';
-import type { AppSchema } from '@/vstutils/schema';
-import AppRoot from '@/vstutils/AppRoot.vue';
-import { AutoUpdateController } from '@/vstutils/autoupdate';
-import type { ComponentsRegistrator } from '@/vstutils/ComponentsRegistrator';
-import { globalComponentsRegistrator } from '@/vstutils/ComponentsRegistrator';
-import { addDefaultFields, FieldsResolver } from '@/vstutils/fields';
-import type { ModelConstructor } from '@/vstutils/models';
-import { ModelsResolver } from '@/vstutils/models';
-import { ErrorHandler } from '@/vstutils/popUp';
-import { QuerySetsResolver } from '@/vstutils/querySet';
-import { RouterConstructor } from '@/vstutils/router';
+import type { CustomVueI18n } from './translation';
+
+import { ActionsManager } from '#vstutils/actions';
+import type { ApiConnector } from '#vstutils/api';
+import { apiConnector } from '#vstutils/api';
+import type { Language } from '#vstutils/api/TranslationsManager';
+import { TranslationsManager } from '#vstutils/api/TranslationsManager';
+import type { AppSchema } from '#vstutils/schema';
+import AppRoot from '#vstutils/AppRoot.vue';
+import { AutoUpdateController } from '#vstutils/autoupdate';
+import type { ComponentsRegistrator } from '#vstutils/ComponentsRegistrator';
+import { globalComponentsRegistrator } from '#vstutils/ComponentsRegistrator';
+import { addDefaultFields, FieldsResolver } from '#vstutils/fields';
+import type { ModelConstructor } from '#vstutils/models';
+import { ModelsResolver } from '#vstutils/models';
+import { ErrorHandler } from '#vstutils/popUp';
+import { QuerySetsResolver } from '#vstutils/querySet';
+import { RouterConstructor } from '#vstutils/router';
 import {
     APP_AFTER_INIT,
     APP_BEFORE_INIT,
     APP_CREATED,
     SCHEMA_MODELS_CREATED,
     signals,
-} from '@/vstutils/signals';
-import type { GlobalStore, LocalSettingsStore, UserSettingsStore } from '@/vstutils/store';
-import { createLocalSettingsStore, createUserSettingsStore, GLOBAL_STORE, pinia } from '@/vstutils/store';
-import { i18n } from '@/vstutils/translation';
-import * as utils from '@/vstutils/utils';
-import type { IView, BaseView } from '@/vstutils/views';
-import { ListView, PageNewView, PageView, ViewsTree } from '@/vstutils/views';
-import ViewConstructor from '@/vstutils/views/ViewConstructor.js';
-import { setupPushNotifications } from '@/vstutils/webpush';
+} from '#vstutils/signals';
+import type { GlobalStore, LocalSettingsStore, UserSettingsStore } from '#vstutils/store';
+import { createLocalSettingsStore, createUserSettingsStore, GLOBAL_STORE, pinia } from '#vstutils/store';
+import { i18n } from '#vstutils/translation';
+import * as utils from '#vstutils/utils';
+import type { IView, BaseView } from '#vstutils/views';
+import { ListView, PageNewView, PageView, ViewsTree } from '#vstutils/views';
+import ViewConstructor from '#vstutils/views/ViewConstructor.js';
+import { setupPushNotifications } from '#vstutils/webpush';
 import type { UserProfile, InitAppConfig } from './init-app';
 
-import type { GlobalStoreInitialized } from '@/vstutils/store/globalStore';
+import type { GlobalStoreInitialized } from '#vstutils/store/globalStore';
 
 export function getCentrifugoClient(address?: string, token?: string) {
     if (!address) {
@@ -74,7 +74,7 @@ export interface IApp {
     centrifugoClient: Centrifuge | null;
 
     router: VueRouter | null;
-    i18n: VueI18n;
+    i18n: CustomVueI18n;
 
     api: ApiConnector;
     languages: Language[] | null;
@@ -144,7 +144,7 @@ export class App implements IApp {
     centrifugoClient: Centrifuge | null;
 
     router: VueRouter | null;
-    i18n: VueI18n;
+    i18n: CustomVueI18n;
 
     api: ApiConnector;
     languages: Language[] | null;
diff --git a/frontend_src/vstutils/autoupdate/useAutoUpdate.ts b/frontend_src/vstutils/autoupdate/useAutoUpdate.ts
index 415e1bb2..1cc44a41 100644
--- a/frontend_src/vstutils/autoupdate/useAutoUpdate.ts
+++ b/frontend_src/vstutils/autoupdate/useAutoUpdate.ts
@@ -1,7 +1,7 @@
 import { onBeforeUnmount, onMounted, getCurrentInstance, onScopeDispose } from 'vue';
 import { State } from 'centrifuge';
 
-import { getApp, getUniqueId } from '@/vstutils/utils';
+import { getApp, getUniqueId } from '#vstutils/utils';
 import type {
     AutoUpdateAction,
     CentrifugoAutoUpdateAction,
diff --git a/frontend_src/vstutils/breadcrumbs.ts b/frontend_src/vstutils/breadcrumbs.ts
index d98cee59..c7b2b00f 100644
--- a/frontend_src/vstutils/breadcrumbs.ts
+++ b/frontend_src/vstutils/breadcrumbs.ts
@@ -1,5 +1,5 @@
 import { computed } from 'vue';
-import { getApp, isNotFoundView } from '@/vstutils/utils';
+import { getApp, isNotFoundView } from '#vstutils/utils';
 
 export interface Breadcrumb {
     link?: string;
diff --git a/frontend_src/vstutils/components/BootstrapModal.vue b/frontend_src/vstutils/components/BootstrapModal.vue
index ee98745b..c87fac02 100644
--- a/frontend_src/vstutils/components/BootstrapModal.vue
+++ b/frontend_src/vstutils/components/BootstrapModal.vue
@@ -49,7 +49,7 @@
     import $ from 'jquery';
     import type JQuery from 'jquery';
     import { defineComponent } from 'vue';
-    import OverlayLoader from '@/vstutils/components/OverlayLoader.vue';
+    import OverlayLoader from '#vstutils/components/OverlayLoader.vue';
 
     // When at least one modal window is open we ensure that 'modal-open' css class is applied to body
     const [onModalOpened, onModalClosed] = (() => {
diff --git a/frontend_src/vstutils/components/Card.vue b/frontend_src/vstutils/components/Card.vue
index e96140ff..d02c24e8 100644
--- a/frontend_src/vstutils/components/Card.vue
+++ b/frontend_src/vstutils/components/Card.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-    import OverlayLoader from '@/vstutils/components/OverlayLoader.vue';
+    import OverlayLoader from '#vstutils/components/OverlayLoader.vue';
 
     export default {
         components: { OverlayLoader },
diff --git a/frontend_src/vstutils/components/common/AppModals.vue b/frontend_src/vstutils/components/common/AppModals.vue
index 4505df46..2e950b5d 100644
--- a/frontend_src/vstutils/components/common/AppModals.vue
+++ b/frontend_src/vstutils/components/common/AppModals.vue
@@ -32,8 +32,8 @@
 
 <script setup lang="ts">
     import { ref } from 'vue';
-    import { i18n } from '@/vstutils/translation';
-    import { getApp, saveAllSettings } from '@/vstutils/utils';
+    import { i18n } from '#vstutils/translation';
+    import { getApp, saveAllSettings } from '#vstutils/utils';
     import ConfirmModal from './ConfirmModal.vue';
 
     const app = getApp();
diff --git a/frontend_src/vstutils/components/common/Breadcrumbs.vue b/frontend_src/vstutils/components/common/Breadcrumbs.vue
index b9353d7f..7018f4dc 100644
--- a/frontend_src/vstutils/components/common/Breadcrumbs.vue
+++ b/frontend_src/vstutils/components/common/Breadcrumbs.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script setup lang="ts">
-    import type { Breadcrumb } from '@/vstutils/breadcrumbs';
+    import type { Breadcrumb } from '#vstutils/breadcrumbs';
 
     defineProps<{
         items: Breadcrumb[];
diff --git a/frontend_src/vstutils/components/common/ButtonsRow.vue b/frontend_src/vstutils/components/common/ButtonsRow.vue
index 0fe3e221..3d40d1f3 100644
--- a/frontend_src/vstutils/components/common/ButtonsRow.vue
+++ b/frontend_src/vstutils/components/common/ButtonsRow.vue
@@ -85,7 +85,7 @@
     import OperationButton from './OperationButton.vue';
     import CompactOperations from './CompactOperations.vue';
 
-    import type { Action, IView, Sublink } from '@/vstutils/views';
+    import type { Action, IView, Sublink } from '#vstutils/views';
 
     const props = withDefaults(
         defineProps<{
diff --git a/frontend_src/vstutils/components/common/EntityView.vue b/frontend_src/vstutils/components/common/EntityView.vue
index dd84c3b1..dc0604a4 100644
--- a/frontend_src/vstutils/components/common/EntityView.vue
+++ b/frontend_src/vstutils/components/common/EntityView.vue
@@ -30,15 +30,15 @@
     import { computed, ref } from 'vue';
     import { useRoute } from 'vue-router/composables';
 
-    import { getApp, openSublink as _openSublink } from '@/vstutils/utils';
-    import { createViewStore } from '@/vstutils/store';
+    import { getApp, openSublink as _openSublink } from '#vstutils/utils';
+    import { createViewStore } from '#vstutils/store';
     import Preloader from './Preloader.vue';
     import ButtonsRow from './ButtonsRow.vue';
     import SelectedFilters from './SelectedFilters.vue';
     import ErrorPage from '../ErrorPage.vue';
 
-    import type { BaseViewStore } from '@/vstutils/store';
-    import type { Action, Sublink } from '@/vstutils/views';
+    import type { BaseViewStore } from '#vstutils/store';
+    import type { Action, Sublink } from '#vstutils/views';
 
     const props = withDefaults(
         defineProps<{
diff --git a/frontend_src/vstutils/components/items/ControlSidebar.vue b/frontend_src/vstutils/components/items/ControlSidebar.vue
index 264ab758..3e3b4512 100644
--- a/frontend_src/vstutils/components/items/ControlSidebar.vue
+++ b/frontend_src/vstutils/components/items/ControlSidebar.vue
@@ -44,15 +44,15 @@
 </template>
 
 <script lang="ts">
-    import { cleanAllCacheAndReloadPage } from '@/vstutils/cleanCacheHelpers.js';
+    import { cleanAllCacheAndReloadPage } from '#vstutils/cleanCacheHelpers.js';
     import { HelpModal } from './modal';
     import ControlSidebarButton from './ControlSidebarButton.vue';
     import ConfirmModal from '../common/ConfirmModal.vue';
-    import { saveAllSettings } from '@/vstutils/utils';
+    import { saveAllSettings } from '#vstutils/utils';
 
-    import type { Field, SetFieldValueOptions } from '@/vstutils/fields/base';
-    import type { NestedObjectField } from '@/vstutils/fields/nested-object';
-    import type AppRoot from '@/vstutils/AppRoot.vue';
+    import type { Field, SetFieldValueOptions } from '#vstutils/fields/base';
+    import type { NestedObjectField } from '#vstutils/fields/nested-object';
+    import type AppRoot from '#vstutils/AppRoot.vue';
 
     type AppRootEl = InstanceType<typeof AppRoot>;
 
diff --git a/frontend_src/vstutils/components/items/modal/HelpModal.vue b/frontend_src/vstutils/components/items/modal/HelpModal.vue
index d4bf8a24..30807311 100644
--- a/frontend_src/vstutils/components/items/modal/HelpModal.vue
+++ b/frontend_src/vstutils/components/items/modal/HelpModal.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script>
-    import { cleanAllCacheAndReloadPage } from '@/vstutils/cleanCacheHelpers.js';
+    import { cleanAllCacheAndReloadPage } from '#vstutils/cleanCacheHelpers.js';
     import ModalWindowAndButtonMixin from '../../../fields/ModalWindowAndButtonMixin.js';
     import BootstrapModal from './../../BootstrapModal.vue';
     import ControlSidebarButton from '../ControlSidebarButton.vue';
diff --git a/frontend_src/vstutils/components/list/AddChild.vue b/frontend_src/vstutils/components/list/AddChild.vue
index 43747017..fda3c9e1 100644
--- a/frontend_src/vstutils/components/list/AddChild.vue
+++ b/frontend_src/vstutils/components/list/AddChild.vue
@@ -50,16 +50,16 @@
     import { computed, ref, watch } from 'vue';
     import { useRoute } from 'vue-router/composables';
 
-    import { i18n } from '@/vstutils/translation';
-    import { formatPath, getApp, RequestTypes } from '@/vstutils/utils';
-    import { usePagination, useSelection } from '@/vstutils/store';
-    import { guiPopUp, pop_up_msg } from '@/vstutils/popUp';
-    import { createInstancesList } from '@/vstutils/models';
-    import ListTable from '@/vstutils/components/list/ListTable.vue';
-    import Pagination from '@/vstutils/components/list/Pagination.vue';
-    import OverlayLoader from '@/vstutils/components/OverlayLoader.vue';
-    import type { ListView } from '@/vstutils/views';
-    import type { InstancesList } from '@/vstutils/models';
+    import { i18n } from '#vstutils/translation';
+    import { formatPath, getApp, RequestTypes } from '#vstutils/utils';
+    import { usePagination, useSelection } from '#vstutils/store';
+    import { guiPopUp, pop_up_msg } from '#vstutils/popUp';
+    import { createInstancesList } from '#vstutils/models';
+    import ListTable from '#vstutils/components/list/ListTable.vue';
+    import Pagination from '#vstutils/components/list/Pagination.vue';
+    import OverlayLoader from '#vstutils/components/OverlayLoader.vue';
+    import type { ListView } from '#vstutils/views';
+    import type { InstancesList } from '#vstutils/models';
 
     const emit = defineEmits<{
         (e: 'close'): void;
diff --git a/frontend_src/vstutils/components/list/AddChildModal.vue b/frontend_src/vstutils/components/list/AddChildModal.vue
index df4d8228..e7173ccb 100644
--- a/frontend_src/vstutils/components/list/AddChildModal.vue
+++ b/frontend_src/vstutils/components/list/AddChildModal.vue
@@ -10,9 +10,9 @@
 </template>
 
 <script setup lang="ts">
-    import BootstrapModal from '@/vstutils/components/BootstrapModal.vue';
+    import BootstrapModal from '#vstutils/components/BootstrapModal.vue';
     import AddChild from './AddChild.vue';
-    import type { ListView } from '@/vstutils/views';
+    import type { ListView } from '#vstutils/views';
 
     defineProps<{ view: ListView }>();
 </script>
diff --git a/frontend_src/vstutils/components/list/FiltersModal.vue b/frontend_src/vstutils/components/list/FiltersModal.vue
index f37cd245..ce5af7a9 100644
--- a/frontend_src/vstutils/components/list/FiltersModal.vue
+++ b/frontend_src/vstutils/components/list/FiltersModal.vue
@@ -27,11 +27,11 @@
 
 <script lang="ts" setup>
     import { computed, ref, set } from 'vue';
-    import { emptyRepresentData, getApp, mapObjectValues } from '@/vstutils/utils';
+    import { emptyRepresentData, getApp, mapObjectValues } from '#vstutils/utils';
     import BootstrapModal from '../BootstrapModal.vue';
-    import type { RepresentData } from '@/vstutils/utils';
-    import type { ListView, ViewStore } from '@/vstutils/views';
-    import type { SetFieldValueOptions } from '@/vstutils/fields/base';
+    import type { RepresentData } from '#vstutils/utils';
+    import type { ListView, ViewStore } from '#vstutils/views';
+    import type { SetFieldValueOptions } from '#vstutils/fields/base';
 
     const props = defineProps<{
         view: ListView;
diff --git a/frontend_src/vstutils/components/list/ListTable.vue b/frontend_src/vstutils/components/list/ListTable.vue
index 63b698a2..d0f68e45 100644
--- a/frontend_src/vstutils/components/list/ListTable.vue
+++ b/frontend_src/vstutils/components/list/ListTable.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-    import { filterOperations } from '@/vstutils/signals';
+    import { filterOperations } from '#vstutils/signals';
     import Popover from '../Popover.vue';
     import SelectToggleButton from './SelectToggleButton.vue';
     import ListTableRow from './ListTableRow.vue';
diff --git a/frontend_src/vstutils/components/list/ListViewComponent.vue b/frontend_src/vstutils/components/list/ListViewComponent.vue
index 4010cfc8..b854f34f 100644
--- a/frontend_src/vstutils/components/list/ListViewComponent.vue
+++ b/frontend_src/vstutils/components/list/ListViewComponent.vue
@@ -68,14 +68,14 @@
     import { computed, provide, ref } from 'vue';
     import { storeToRefs } from 'pinia';
 
-    import { ViewPropsDef } from '@/vstutils/views/props';
-    import { useViewStore } from '@/vstutils/store';
+    import { ViewPropsDef } from '#vstutils/views/props';
+    import { useViewStore } from '#vstutils/store';
 
     import ListTable from './ListTable.vue';
     import MultiActions from './MultiActions.vue';
     import Pagination from './Pagination.vue';
 
-    import type { ListView, ViewPropsDefType } from '@/vstutils/views';
+    import type { ListView, ViewPropsDefType } from '#vstutils/views';
 
     const props = defineProps(ViewPropsDef as ViewPropsDefType<ListView>);
 
diff --git a/frontend_src/vstutils/components/list/NotEmptyMultiactionModal.vue b/frontend_src/vstutils/components/list/NotEmptyMultiactionModal.vue
index 6a77dc1d..655e6818 100644
--- a/frontend_src/vstutils/components/list/NotEmptyMultiactionModal.vue
+++ b/frontend_src/vstutils/components/list/NotEmptyMultiactionModal.vue
@@ -28,14 +28,14 @@
     import { defineStore } from 'pinia';
     import { useRoute } from 'vue-router/composables';
 
-    import { guiPopUp, pop_up_msg } from '@/vstutils/popUp';
-    import { i18n } from '@/vstutils/translation';
-    import { formatPath, parseResponseMessage, getUniqueId, getApp } from '@/vstutils/utils';
-    import { createActionStore } from '@/vstutils/store/helpers';
-    import BootstrapModal from '@/vstutils/components/BootstrapModal.vue';
-    import ModelFields from '@/vstutils/components/page/ModelFields.vue';
+    import { guiPopUp, pop_up_msg } from '#vstutils/popUp';
+    import { i18n } from '#vstutils/translation';
+    import { formatPath, parseResponseMessage, getUniqueId, getApp } from '#vstutils/utils';
+    import { createActionStore } from '#vstutils/store/helpers';
+    import BootstrapModal from '#vstutils/components/BootstrapModal.vue';
+    import ModelFields from '#vstutils/components/page/ModelFields.vue';
 
-    import type { Action, ListView, ViewStore } from '@/vstutils/views';
+    import type { Action, ListView, ViewStore } from '#vstutils/views';
 
     const props = defineProps<{
         action: Action;
diff --git a/frontend_src/vstutils/components/list/Pagination.vue b/frontend_src/vstutils/components/list/Pagination.vue
index fa527d95..5ac3fd9e 100644
--- a/frontend_src/vstutils/components/list/Pagination.vue
+++ b/frontend_src/vstutils/components/list/Pagination.vue
@@ -23,7 +23,7 @@
 <script setup lang="ts">
     import type { RawLocation } from 'vue-router';
     import { useRoute } from 'vue-router/composables';
-    import type { PaginationItem } from '@/vstutils/store';
+    import type { PaginationItem } from '#vstutils/store';
 
     defineProps<{
         useEmits?: boolean;
diff --git a/frontend_src/vstutils/components/page/DefaultView.vue b/frontend_src/vstutils/components/page/DefaultView.vue
index 12e406a1..b16532c1 100644
--- a/frontend_src/vstutils/components/page/DefaultView.vue
+++ b/frontend_src/vstutils/components/page/DefaultView.vue
@@ -22,11 +22,11 @@
 <script setup lang="ts">
     import { computed, getCurrentInstance } from 'vue';
     import { storeToRefs } from 'pinia';
-    import { ViewTypes } from '@/vstutils/utils';
-    import { useViewStore } from '@/vstutils/store';
-    import ModelFields from '@/vstutils/components/page/ModelFields.vue';
+    import { ViewTypes } from '#vstutils/utils';
+    import { useViewStore } from '#vstutils/store';
+    import ModelFields from '#vstutils/components/page/ModelFields.vue';
 
-    import type { DetailView } from '@/vstutils/views';
+    import type { DetailView } from '#vstutils/views';
 
     const store = useViewStore<DetailView>();
     const view = computed(() => store.view as DetailView);
diff --git a/frontend_src/vstutils/components/page/FiltersModalDetail.vue b/frontend_src/vstutils/components/page/FiltersModalDetail.vue
index 58221f71..9a2d0a64 100644
--- a/frontend_src/vstutils/components/page/FiltersModalDetail.vue
+++ b/frontend_src/vstutils/components/page/FiltersModalDetail.vue
@@ -27,12 +27,12 @@
 
 <script setup lang="ts">
     import { computed, ref } from 'vue';
-    import { getApp, mergeDeep } from '@/vstutils/utils';
-    import BootstrapModal from '@/vstutils/components/BootstrapModal.vue';
-    import ModelFields from '@/vstutils/components/page/ModelFields.vue';
-    import type { PageView, ViewStore } from '@/vstutils/views';
-    import type { InnerData } from '@/vstutils/utils';
-    import type { Model } from '@/vstutils/models';
+    import { getApp, mergeDeep } from '#vstutils/utils';
+    import BootstrapModal from '#vstutils/components/BootstrapModal.vue';
+    import ModelFields from '#vstutils/components/page/ModelFields.vue';
+    import type { PageView, ViewStore } from '#vstutils/views';
+    import type { InnerData } from '#vstutils/utils';
+    import type { Model } from '#vstutils/models';
 
     const props = defineProps<{
         view: PageView;
diff --git a/frontend_src/vstutils/components/page/HideNotRequiredSelect.vue b/frontend_src/vstutils/components/page/HideNotRequiredSelect.vue
index 76296963..f315ae1a 100644
--- a/frontend_src/vstutils/components/page/HideNotRequiredSelect.vue
+++ b/frontend_src/vstutils/components/page/HideNotRequiredSelect.vue
@@ -22,8 +22,8 @@
 
 <script setup lang="ts">
     import { ref } from 'vue';
-    import { getUniqueId } from '@/vstutils/utils';
-    import type { Field } from '@/vstutils/fields/base';
+    import { getUniqueId } from '#vstutils/utils';
+    import type { Field } from '#vstutils/fields/base';
 
     const props = defineProps<{
         fields: Field[];
diff --git a/frontend_src/vstutils/components/page/ModelFields.vue b/frontend_src/vstutils/components/page/ModelFields.vue
index 61b007ae..7edfa5e1 100644
--- a/frontend_src/vstutils/components/page/ModelFields.vue
+++ b/frontend_src/vstutils/components/page/ModelFields.vue
@@ -84,13 +84,13 @@
         getFieldsInstancesGroups,
         getModelFieldsInstancesGroups,
         useHideableFieldsGroups,
-    } from '@/vstutils/composables';
-    import Card from '@/vstutils/components/Card.vue';
+    } from '#vstutils/composables';
+    import Card from '#vstutils/components/Card.vue';
     import HideNotRequiredSelect from './HideNotRequiredSelect.vue';
 
-    import type { Field, FieldComponentType, SetFieldValueOptions } from '@/vstutils/fields/base';
-    import type { FieldsGroup, ModelConstructor } from '@/vstutils/models';
-    import type { RepresentData } from '@/vstutils/utils';
+    import type { Field, FieldComponentType, SetFieldValueOptions } from '#vstutils/fields/base';
+    import type { FieldsGroup, ModelConstructor } from '#vstutils/models';
+    import type { RepresentData } from '#vstutils/utils';
 
     const props = defineProps<{
         data: RepresentData;
diff --git a/frontend_src/vstutils/components/page/OneEntity.vue b/frontend_src/vstutils/components/page/OneEntity.vue
index 36ed87e4..5bedb1b4 100644
--- a/frontend_src/vstutils/components/page/OneEntity.vue
+++ b/frontend_src/vstutils/components/page/OneEntity.vue
@@ -5,8 +5,8 @@
 
 <script setup lang="ts">
     import { computed } from 'vue';
-    import { ViewPropsDef } from '@/vstutils/views/props';
-    import { type ViewPropsDefType, type DetailView } from '@/vstutils/views';
+    import { ViewPropsDef } from '#vstutils/views/props';
+    import { type ViewPropsDefType, type DetailView } from '#vstutils/views';
     import DefaultView from './DefaultView.vue';
     import SteppedView from './tabbed/SteppedView.vue';
 
diff --git a/frontend_src/vstutils/components/page/tabbed/SteppedView.vue b/frontend_src/vstutils/components/page/tabbed/SteppedView.vue
index 0634a167..a992b258 100644
--- a/frontend_src/vstutils/components/page/tabbed/SteppedView.vue
+++ b/frontend_src/vstutils/components/page/tabbed/SteppedView.vue
@@ -3,9 +3,9 @@
 </template>
 
 <script setup lang="ts">
-    import { useViewStore } from '@/vstutils/store';
-    import { ViewTypes } from '@/vstutils/utils';
-    import { type DetailView } from '@/vstutils/views';
+    import { useViewStore } from '#vstutils/store';
+    import { ViewTypes } from '#vstutils/utils';
+    import { type DetailView } from '#vstutils/views';
     import { computed } from 'vue';
     import TabbedDetail from './TabbedDetail.vue';
 
diff --git a/frontend_src/vstutils/components/page/tabbed/TabbedDetail.vue b/frontend_src/vstutils/components/page/tabbed/TabbedDetail.vue
index 83c4019b..cf84baba 100644
--- a/frontend_src/vstutils/components/page/tabbed/TabbedDetail.vue
+++ b/frontend_src/vstutils/components/page/tabbed/TabbedDetail.vue
@@ -76,7 +76,7 @@
 
 <script setup lang="ts">
     import { computed, toRef } from 'vue';
-    import { type Model } from '@/vstutils/models';
+    import { type Model } from '#vstutils/models';
     import { useTabbedDetailState } from './state';
 
     const props = defineProps<{
diff --git a/frontend_src/vstutils/components/page/tabbed/state.ts b/frontend_src/vstutils/components/page/tabbed/state.ts
index 1ab76bb8..afe59ec8 100644
--- a/frontend_src/vstutils/components/page/tabbed/state.ts
+++ b/frontend_src/vstutils/components/page/tabbed/state.ts
@@ -1,9 +1,9 @@
 import { computed, ref, del, type Ref } from 'vue';
-import { pop_up_msg } from '@/vstutils/popUp';
-import { getModelFieldsInstancesGroups, useHideableFieldsGroups } from '@/vstutils/composables';
-import type { SetFieldValueOptions } from '@/vstutils/fields/base';
-import { ModelValidationError, type Model, type ModelConstructor } from '@/vstutils/models';
-import { getApp } from '@/vstutils/utils';
+import { pop_up_msg } from '#vstutils/popUp';
+import { getModelFieldsInstancesGroups, useHideableFieldsGroups } from '#vstutils/composables';
+import type { SetFieldValueOptions } from '#vstutils/fields/base';
+import { ModelValidationError, type Model, type ModelConstructor } from '#vstutils/models';
+import { getApp } from '#vstutils/utils';
 
 export function useTabbedDetailState(opts: { instance: Ref<Model>; requireStepValidation?: boolean }) {
     const { instance, requireStepValidation = false } = opts;
diff --git a/frontend_src/vstutils/components/wysiwyg-editor/index.ts b/frontend_src/vstutils/components/wysiwyg-editor/index.ts
index 8ff2ba41..314cd588 100644
--- a/frontend_src/vstutils/components/wysiwyg-editor/index.ts
+++ b/frontend_src/vstutils/components/wysiwyg-editor/index.ts
@@ -1,8 +1,8 @@
 import type { Editor as VueEditor } from '@toast-ui/vue-editor';
 import type { Editor, EditorOptions } from '@toast-ui/editor';
-import { i18n } from '@/vstutils/translation';
+import { i18n } from '#vstutils/translation';
 import { computed, defineAsyncComponent, defineComponent, h } from 'vue';
-import { getApp } from '@/vstutils/utils';
+import { getApp } from '#vstutils/utils';
 
 interface LangInfo {
     code: string;
diff --git a/frontend_src/vstutils/composables.ts b/frontend_src/vstutils/composables.ts
index 1c359963..73591bf2 100644
--- a/frontend_src/vstutils/composables.ts
+++ b/frontend_src/vstutils/composables.ts
@@ -2,9 +2,9 @@ import { computed, ref, unref } from 'vue';
 import { useResizeObserver } from '@vueuse/core';
 
 import type { ComputedRef, Ref } from 'vue';
-import type { FieldsGroup, FieldsInstancesGroup, ModelConstructor } from '@/vstutils/models';
-import type { RepresentData } from '@/vstutils/utils';
-import type { Field } from '@/vstutils/fields/base';
+import type { FieldsGroup, FieldsInstancesGroup, ModelConstructor } from '#vstutils/models';
+import type { RepresentData } from '#vstutils/utils';
+import type { Field } from '#vstutils/fields/base';
 import { getAdditionalPropertiesField, hasAdditionalProperties } from './additionalProperties';
 
 export function getFieldsInstancesGroups(model: ModelConstructor, groups: FieldsGroup[]) {
diff --git a/frontend_src/vstutils/default-auth-app/helpers.ts b/frontend_src/vstutils/default-auth-app/helpers.ts
index ed1e69fe..04a99548 100644
--- a/frontend_src/vstutils/default-auth-app/helpers.ts
+++ b/frontend_src/vstutils/default-auth-app/helpers.ts
@@ -1,7 +1,7 @@
 import { type UserManager } from 'oidc-client-ts';
 import { provide, type InjectionKey, inject } from 'vue';
 import type VueI18n from 'vue-i18n';
-import { type InitAppConfig } from '@/vstutils/init-app';
+import { type InitAppConfig } from '#vstutils/init-app';
 import { TranslationsManager } from '../api/TranslationsManager';
 import { createVueI18n } from '../translation';
 import { getCookie } from '../utils';
diff --git a/frontend_src/vstutils/default-auth-app/index.ts b/frontend_src/vstutils/default-auth-app/index.ts
index 990c16b2..067cb30d 100644
--- a/frontend_src/vstutils/default-auth-app/index.ts
+++ b/frontend_src/vstutils/default-auth-app/index.ts
@@ -1,6 +1,6 @@
 import Vue, { type Component, type AsyncComponent, h, defineAsyncComponent } from 'vue';
 import VueRouter, { type RouteConfig } from 'vue-router';
-import { type AuthAppFactory } from '@/vstutils/auth-app';
+import { type AuthAppFactory } from '#vstutils/auth-app';
 import {
     provideOauth2UserManager,
     provideMainAppOpener,
diff --git a/frontend_src/vstutils/default-auth-app/pages/RegistrationConfirmEmail.vue b/frontend_src/vstutils/default-auth-app/pages/RegistrationConfirmEmail.vue
index dded9aa0..702f7a13 100644
--- a/frontend_src/vstutils/default-auth-app/pages/RegistrationConfirmEmail.vue
+++ b/frontend_src/vstutils/default-auth-app/pages/RegistrationConfirmEmail.vue
@@ -11,7 +11,7 @@
     import { ref } from 'vue';
     import { useRoute, useRouter } from 'vue-router/composables';
     import { useTranslationsManager, useInitAppConfig } from './../helpers';
-    import Spinner from '@/vstutils/components/Spinner.vue';
+    import Spinner from '#vstutils/components/Spinner.vue';
 
     const router = useRouter();
     const route = useRoute();
diff --git a/frontend_src/vstutils/fetch-values.ts b/frontend_src/vstutils/fetch-values.ts
index 6671dfc6..ea749bf3 100644
--- a/frontend_src/vstutils/fetch-values.ts
+++ b/frontend_src/vstutils/fetch-values.ts
@@ -1,14 +1,14 @@
-import { i18n } from '@/vstutils/translation';
-import { AggregatedQueriesExecutor } from '@/vstutils/AggregatedQueriesExecutor';
-import { OBJECT_NOT_FOUND_TEXT, RequestTypes, createPropertyProxy, getApp } from '@/vstutils/utils';
-import { ArrayField } from '@/vstutils/fields/array/ArrayField';
-import { DynamicField } from '@/vstutils/fields/dynamic';
-
-import type { BaseView } from '@/vstutils/views';
-import type { Model, ModelConstructor } from '@/vstutils/models';
-import type { Field } from '@/vstutils/fields/base';
-import type { QuerySet } from '@/vstutils/querySet';
-import type { InnerData } from '@/vstutils/utils';
+import { i18n } from '#vstutils/translation';
+import { AggregatedQueriesExecutor } from '#vstutils/AggregatedQueriesExecutor';
+import { OBJECT_NOT_FOUND_TEXT, RequestTypes, createPropertyProxy, getApp } from '#vstutils/utils';
+import { ArrayField } from '#vstutils/fields/array/ArrayField';
+import { DynamicField } from '#vstutils/fields/dynamic';
+
+import type { BaseView } from '#vstutils/views';
+import type { Model, ModelConstructor } from '#vstutils/models';
+import type { Field } from '#vstutils/fields/base';
+import type { QuerySet } from '#vstutils/querySet';
+import type { InnerData } from '#vstutils/utils';
 import { RelatedListField } from './fields/related-list';
 
 export interface IFetchableField extends Field<string | number> {
diff --git a/frontend_src/vstutils/fields/__tests__/fields-container-classes.test.ts b/frontend_src/vstutils/fields/__tests__/fields-container-classes.test.ts
index 9e95dee3..7cb2240a 100644
--- a/frontend_src/vstutils/fields/__tests__/fields-container-classes.test.ts
+++ b/frontend_src/vstutils/fields/__tests__/fields-container-classes.test.ts
@@ -1,7 +1,7 @@
-import { createApp, createSchema } from '@/unittests';
-import { useEntityViewClasses } from '@/vstutils/store';
+import { createApp, createSchema } from '#unittests';
+import { useEntityViewClasses } from '#vstutils/store';
 import { ref } from 'vue';
-import { emptyRepresentData } from '@/vstutils/utils';
+import { emptyRepresentData } from '#vstutils/utils';
 
 test('fields container classes', async () => {
     const app = await createApp({ schema: createSchema() });
diff --git a/frontend_src/vstutils/fields/array/ArrayField.ts b/frontend_src/vstutils/fields/array/ArrayField.ts
index 9a926fdb..4368936d 100644
--- a/frontend_src/vstutils/fields/array/ArrayField.ts
+++ b/frontend_src/vstutils/fields/array/ArrayField.ts
@@ -6,10 +6,10 @@ import type {
     Field,
     FieldOptions,
     FieldXOptions,
-} from '@/vstutils/fields/base';
-import { BaseField } from '@/vstutils/fields/base';
-import { onAppBeforeInit } from '@/vstutils/signals';
-import type { InnerData, RepresentData } from '@/vstutils/utils';
+} from '#vstutils/fields/base';
+import { BaseField } from '#vstutils/fields/base';
+import { onAppBeforeInit } from '#vstutils/signals';
+import type { InnerData, RepresentData } from '#vstutils/utils';
 
 import { ArrayFieldMixin } from './mixins';
 
diff --git a/frontend_src/vstutils/fields/array/ArrayFieldEdit.vue b/frontend_src/vstutils/fields/array/ArrayFieldEdit.vue
index 01dfdbe7..814dd5d4 100644
--- a/frontend_src/vstutils/fields/array/ArrayFieldEdit.vue
+++ b/frontend_src/vstutils/fields/array/ArrayFieldEdit.vue
@@ -25,7 +25,7 @@
 <script>
     import $ from 'jquery';
     import Vue from 'vue';
-    import { createUniqueIdGenerator } from '@/vstutils/utils';
+    import { createUniqueIdGenerator } from '#vstutils/utils';
     import { BaseFieldContentEdit } from '../base';
 
     const idGenerator = createUniqueIdGenerator();
diff --git a/frontend_src/vstutils/fields/array/mixins.ts b/frontend_src/vstutils/fields/array/mixins.ts
index a3d3a6ca..39d014af 100644
--- a/frontend_src/vstutils/fields/array/mixins.ts
+++ b/frontend_src/vstutils/fields/array/mixins.ts
@@ -1,7 +1,7 @@
 import { set, defineComponent, h } from 'vue';
 
-import { FieldReadonlyEmitsDef, FieldReadonlyPropsDef } from '@/vstutils/fields/base';
-import { BaseFieldMixin } from '@/vstutils/fields/base';
+import { FieldReadonlyEmitsDef, FieldReadonlyPropsDef } from '#vstutils/fields/base';
+import { BaseFieldMixin } from '#vstutils/fields/base';
 import ArrayFieldEdit from './ArrayFieldEdit.vue';
 
 import type { VNode } from 'vue';
@@ -10,7 +10,7 @@ import type {
     FieldReadonlyEmitsDefType,
     FieldReadonlyPropsDefType,
     SetFieldValueOptions,
-} from '@/vstutils/fields/base';
+} from '#vstutils/fields/base';
 import type ArrayField from './ArrayField';
 
 const NOT_INLINE_FIELDS = ['textarea', 'uri'];
diff --git a/frontend_src/vstutils/fields/autocomplete/AutocompleteFieldContentEditMixin.vue b/frontend_src/vstutils/fields/autocomplete/AutocompleteFieldContentEditMixin.vue
index 5bd6d237..65efa3f3 100644
--- a/frontend_src/vstutils/fields/autocomplete/AutocompleteFieldContentEditMixin.vue
+++ b/frontend_src/vstutils/fields/autocomplete/AutocompleteFieldContentEditMixin.vue
@@ -20,7 +20,7 @@
 
 <script>
     import $ from 'jquery';
-    import autoComplete from '@/libs/auto-complete.js';
+    import autoComplete from '#libs/auto-complete.js';
     import { escapeHtml } from '../../utils';
     import { BaseFieldContentEdit } from '../base';
 
diff --git a/frontend_src/vstutils/fields/autocomplete/composables.ts b/frontend_src/vstutils/fields/autocomplete/composables.ts
index 5d7b783b..8eaccae0 100644
--- a/frontend_src/vstutils/fields/autocomplete/composables.ts
+++ b/frontend_src/vstutils/fields/autocomplete/composables.ts
@@ -1,6 +1,6 @@
 import type { Ref } from 'vue';
 import { onMounted } from 'vue';
-import autoComplete from '@/libs/auto-complete.js';
+import autoComplete from '#libs/auto-complete.js';
 
 interface AutocompleteDropdownParams<T> {
     element: Ref<HTMLInputElement | null>;
@@ -16,7 +16,6 @@ export function useAutocompleteDropdown<T>({
     filterItems,
 }: AutocompleteDropdownParams<T>) {
     onMounted(() => {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
         return new autoComplete({
             selector: element.value,
             minChars: 0,
diff --git a/frontend_src/vstutils/fields/barcode/Barcode128Field.ts b/frontend_src/vstutils/fields/barcode/Barcode128Field.ts
index 17372086..32caf13c 100644
--- a/frontend_src/vstutils/fields/barcode/Barcode128Field.ts
+++ b/frontend_src/vstutils/fields/barcode/Barcode128Field.ts
@@ -1,13 +1,13 @@
 import { defineComponent, h, ref } from 'vue';
 
-import type { FieldReadonlyPropsDefType } from '@/vstutils/fields/base';
-import { BaseField, BaseFieldMixin, FieldReadonlyPropsDef } from '@/vstutils/fields/base';
+import type { FieldReadonlyPropsDefType } from '#vstutils/fields/base';
+import { BaseField, BaseFieldMixin, FieldReadonlyPropsDef } from '#vstutils/fields/base';
 import { Html5QrcodeSupportedFormats } from 'html5-qrcode';
 import type { BarcodeField, BarcodeFieldXOptions } from './base';
 import BarcodeFieldContentEdit from './BarcodeFieldContentEdit.vue';
-import FullScreenView from '@/vstutils/components/FullScreenView.vue';
+import FullScreenView from '#vstutils/components/FullScreenView.vue';
 import CanvasRenderer from './CanvasRenderer.vue';
-import { getApp } from '@/vstutils/utils';
+import { getApp } from '#vstutils/utils';
 
 const Barcode128FieldReadOnly = defineComponent({
     props: FieldReadonlyPropsDef as FieldReadonlyPropsDefType<Barcode128Field>,
diff --git a/frontend_src/vstutils/fields/barcode/BarcodeFieldContentEdit.vue b/frontend_src/vstutils/fields/barcode/BarcodeFieldContentEdit.vue
index bb742af2..925aea6a 100644
--- a/frontend_src/vstutils/fields/barcode/BarcodeFieldContentEdit.vue
+++ b/frontend_src/vstutils/fields/barcode/BarcodeFieldContentEdit.vue
@@ -60,12 +60,12 @@
 
 <script setup lang="ts">
     import { ref, computed } from 'vue';
-    import { getApp } from '@/vstutils/utils';
-    import type { FieldEditPropsDefType } from '@/vstutils/fields/base';
-    import { FieldEditPropsDef } from '@/vstutils/fields/base';
+    import { getApp } from '#vstutils/utils';
+    import type { FieldEditPropsDefType } from '#vstutils/fields/base';
+    import { FieldEditPropsDef } from '#vstutils/fields/base';
     import type { BarcodeField } from './base';
     import ScannerCamera from './ScannerCamera.vue';
-    import { useWidthResizeObserver } from '@/vstutils/composables';
+    import { useWidthResizeObserver } from '#vstutils/composables';
 
     const emit = defineEmits<{
         (e: 'set-value', value: string | null | undefined): void;
diff --git a/frontend_src/vstutils/fields/barcode/QRCodeField.ts b/frontend_src/vstutils/fields/barcode/QRCodeField.ts
index 4dad6eda..c66c0b4d 100644
--- a/frontend_src/vstutils/fields/barcode/QRCodeField.ts
+++ b/frontend_src/vstutils/fields/barcode/QRCodeField.ts
@@ -1,13 +1,13 @@
 import { defineComponent, h, ref } from 'vue';
 
-import type { FieldReadonlyPropsDefType } from '@/vstutils/fields/base';
-import { BaseField, BaseFieldMixin, FieldReadonlyPropsDef } from '@/vstutils/fields/base';
+import type { FieldReadonlyPropsDefType } from '#vstutils/fields/base';
+import { BaseField, BaseFieldMixin, FieldReadonlyPropsDef } from '#vstutils/fields/base';
 import { Html5QrcodeSupportedFormats } from 'html5-qrcode';
-import { getApp } from '@/vstutils/utils';
+import { getApp } from '#vstutils/utils';
 import type { BarcodeFieldXOptions, BarcodeField } from './base';
 import BarcodeFieldContentEdit from './BarcodeFieldContentEdit.vue';
 import CanvasRenderer from './CanvasRenderer.vue';
-import FullScreenView from '@/vstutils/components/FullScreenView.vue';
+import FullScreenView from '#vstutils/components/FullScreenView.vue';
 
 const QRFieldReadOnly = defineComponent({
     props: FieldReadonlyPropsDef as FieldReadonlyPropsDefType<QRCodeField>,
diff --git a/frontend_src/vstutils/fields/barcode/ScannerCamera.vue b/frontend_src/vstutils/fields/barcode/ScannerCamera.vue
index 746131cd..8793557c 100644
--- a/frontend_src/vstutils/fields/barcode/ScannerCamera.vue
+++ b/frontend_src/vstutils/fields/barcode/ScannerCamera.vue
@@ -4,7 +4,7 @@
 
 <script setup lang="ts">
     import { onMounted, onBeforeUnmount } from 'vue';
-    import { fitToWrapper, getUniqueId } from '@/vstutils/utils';
+    import { fitToWrapper, getUniqueId } from '#vstutils/utils';
     import type { Html5QrcodeSupportedFormats } from 'html5-qrcode';
     import { Html5Qrcode } from 'html5-qrcode';
     import { useTimeoutFn } from '@vueuse/core';
diff --git a/frontend_src/vstutils/fields/barcode/__tests__/barcode-fields.test.ts b/frontend_src/vstutils/fields/barcode/__tests__/barcode-fields.test.ts
index 0065dda9..a0bc6098 100644
--- a/frontend_src/vstutils/fields/barcode/__tests__/barcode-fields.test.ts
+++ b/frontend_src/vstutils/fields/barcode/__tests__/barcode-fields.test.ts
@@ -1,11 +1,11 @@
-import { createApp, createSchema, useTestCtx, waitForPageLoading } from '@/unittests';
+import { createApp, createSchema, useTestCtx, waitForPageLoading } from '#unittests';
 import schema from './fields-schema.json';
-import type { BaseModel } from '@/vstutils/models';
+import type { BaseModel } from '#vstutils/models';
 import { QRCodeField } from '../QRCodeField';
 import { Barcode128Field } from '../Barcode128Field';
 import { fireEvent } from '@testing-library/dom';
 import { nextTick } from 'vue';
-import { fitToWrapper } from '@/vstutils/utils';
+import { fitToWrapper } from '#vstutils/utils';
 
 // this function is used for box finder sizes calculation
 describe('fitToBox', () => {
diff --git a/frontend_src/vstutils/fields/barcode/base.ts b/frontend_src/vstutils/fields/barcode/base.ts
index 4e39d25d..b4aa67d1 100644
--- a/frontend_src/vstutils/fields/barcode/base.ts
+++ b/frontend_src/vstutils/fields/barcode/base.ts
@@ -1,5 +1,5 @@
 import type { Html5QrcodeSupportedFormats } from 'html5-qrcode';
-import type { Field, FieldXOptions } from '@/vstutils/fields/base';
+import type { Field, FieldXOptions } from '#vstutils/fields/base';
 
 export interface BarcodeField extends Field<string, string, BarcodeFieldXOptions> {
     formatsToSupport: Html5QrcodeSupportedFormats[];
diff --git a/frontend_src/vstutils/fields/base/BaseField.ts b/frontend_src/vstutils/fields/base/BaseField.ts
index ac959646..b02bfdc3 100644
--- a/frontend_src/vstutils/fields/base/BaseField.ts
+++ b/frontend_src/vstutils/fields/base/BaseField.ts
@@ -6,9 +6,9 @@ import { pop_up_msg } from '../../popUp';
 import type { ModelConstructor } from '../../models';
 import BaseFieldMixin from './BaseFieldMixin.vue';
 import { i18n } from '../../translation';
-import type { IApp } from '@/vstutils/app';
+import type { IApp } from '#vstutils/app';
 import type { Component } from 'vue';
-import { BaseFieldLabel } from '@/vstutils/fields/base';
+import { BaseFieldLabel } from '#vstutils/fields/base';
 import type {
     DefaultXOptions,
     Field,
@@ -174,7 +174,6 @@ export class BaseField<Inner, Represent, XOptions extends DefaultXOptions = Defa
 
     /**
      * Method that validates value.
-     * @param {RepresentData} data - Object with all values.
      */
     validateValue(data: RepresentData): Represent | null | undefined {
         let value = this.getValue(data);
diff --git a/frontend_src/vstutils/fields/base/BaseFieldLabel.vue b/frontend_src/vstutils/fields/base/BaseFieldLabel.vue
index f6e61346..87239c2d 100644
--- a/frontend_src/vstutils/fields/base/BaseFieldLabel.vue
+++ b/frontend_src/vstutils/fields/base/BaseFieldLabel.vue
@@ -9,8 +9,8 @@
 
 <script setup lang="ts">
     import { computed } from 'vue';
-    import Popover from '@/vstutils/components/Popover.vue';
-    import { i18n } from '@/vstutils/translation';
+    import Popover from '#vstutils/components/Popover.vue';
+    import { i18n } from '#vstutils/translation';
     import type { FieldLabelPropsDefType } from './props';
     import { FieldLabelPropsDef } from './props';
 
diff --git a/frontend_src/vstutils/fields/base/Field.ts b/frontend_src/vstutils/fields/base/Field.ts
index ddceb06d..51fe2e85 100644
--- a/frontend_src/vstutils/fields/base/Field.ts
+++ b/frontend_src/vstutils/fields/base/Field.ts
@@ -1,5 +1,5 @@
-import type { ModelConstructor, Model } from '@/vstutils/models/Model';
-import type { RepresentData, InnerData } from '@/vstutils/utils';
+import type { ModelConstructor, Model } from '#vstutils/models/Model';
+import type { RepresentData, InnerData } from '#vstutils/utils';
 import type { Schema, ParameterCollectionFormat, ParameterType } from 'swagger-schema-official';
 import type { Component } from 'vue';
 
diff --git a/frontend_src/vstutils/fields/base/props.ts b/frontend_src/vstutils/fields/base/props.ts
index 755e4a70..44b24620 100644
--- a/frontend_src/vstutils/fields/base/props.ts
+++ b/frontend_src/vstutils/fields/base/props.ts
@@ -1,4 +1,4 @@
-import type { RepresentData } from '@/vstutils/utils';
+import type { RepresentData } from '#vstutils/utils';
 import type { ExtractPropTypes, PropType } from 'vue';
 import type { Field } from './BaseField';
 import type { ExtractRepresent } from './types';
diff --git a/frontend_src/vstutils/fields/base/types.ts b/frontend_src/vstutils/fields/base/types.ts
index 479d0628..e49f9f8a 100644
--- a/frontend_src/vstutils/fields/base/types.ts
+++ b/frontend_src/vstutils/fields/base/types.ts
@@ -1,4 +1,4 @@
-import type { Field } from '@/vstutils/fields/base';
+import type { Field } from '#vstutils/fields/base';
 
 export interface SetFieldValueParams {
     markChanged?: boolean;
diff --git a/frontend_src/vstutils/fields/camera-select/CameraSelectField.ts b/frontend_src/vstutils/fields/camera-select/CameraSelectField.ts
index 804b2a39..af31bef2 100644
--- a/frontend_src/vstutils/fields/camera-select/CameraSelectField.ts
+++ b/frontend_src/vstutils/fields/camera-select/CameraSelectField.ts
@@ -1,9 +1,9 @@
 import { computed, h, ref } from 'vue';
 import type { VNode } from 'vue';
 
-import { defineFieldComponent, BaseField } from '@/vstutils/fields/base';
-import type { FieldEditSetupFunction } from '@/vstutils/fields/base';
-import { getApp } from '@/vstutils/utils';
+import { defineFieldComponent, BaseField } from '#vstutils/fields/base';
+import type { FieldEditSetupFunction } from '#vstutils/fields/base';
+import { getApp } from '#vstutils/utils';
 
 const CameraSelectFieldContentEdit: FieldEditSetupFunction<CameraSelectField> = (props, ctx) => {
     const app = getApp();
diff --git a/frontend_src/vstutils/fields/choices/ChoicesArrayFieldEdit.vue b/frontend_src/vstutils/fields/choices/ChoicesArrayFieldEdit.vue
index 73fb6ff0..f5bdef78 100644
--- a/frontend_src/vstutils/fields/choices/ChoicesArrayFieldEdit.vue
+++ b/frontend_src/vstutils/fields/choices/ChoicesArrayFieldEdit.vue
@@ -4,10 +4,10 @@
 
 <script setup lang="ts">
     import { type PropType, ref, computed, onMounted, toRef, watch } from 'vue';
-    import type { ChoicesField } from '@/vstutils/fields/choices';
-    import { useSelect2 } from '@/vstutils/select2';
-    import { deepEqual } from '@/vstutils/utils';
-    import type { ArrayField } from '@/vstutils/fields/array';
+    import type { ChoicesField } from '#vstutils/fields/choices';
+    import { useSelect2 } from '#vstutils/select2';
+    import { deepEqual } from '#vstutils/utils';
+    import type { ArrayField } from '#vstutils/fields/array';
 
     const props = defineProps({
         field: { type: Object as PropType<ArrayField<ChoicesField>>, required: true },
diff --git a/frontend_src/vstutils/fields/choices/ChoicesField.ts b/frontend_src/vstutils/fields/choices/ChoicesField.ts
index 7094fe6c..5788d27c 100644
--- a/frontend_src/vstutils/fields/choices/ChoicesField.ts
+++ b/frontend_src/vstutils/fields/choices/ChoicesField.ts
@@ -1,10 +1,10 @@
-import type { Model } from '@/vstutils/models';
-import type { CustomMatcher, TemplateResult, TemplateSelection } from '@/vstutils/select2';
-import { i18n } from '@/vstutils/translation';
+import type { Model } from '#vstutils/models';
+import type { CustomMatcher, TemplateResult, TemplateSelection } from '#vstutils/select2';
+import { i18n } from '#vstutils/translation';
 import type { FieldOptions, FieldXOptions } from '../base';
 import { StringField } from '../text';
 import ChoicesFieldMixin from './ChoicesFieldMixin.js';
-import type { RepresentData } from '@/vstutils/utils';
+import type { RepresentData } from '#vstutils/utils';
 import { ChoicesArrayFieldMixin } from './array';
 
 export type RawEnumItem = string | [string, string] | { value: string; prefetch_value: string } | Model;
diff --git a/frontend_src/vstutils/fields/choices/ChoicesFieldContentEdit.vue b/frontend_src/vstutils/fields/choices/ChoicesFieldContentEdit.vue
index 99a6e72b..5b45e842 100644
--- a/frontend_src/vstutils/fields/choices/ChoicesFieldContentEdit.vue
+++ b/frontend_src/vstutils/fields/choices/ChoicesFieldContentEdit.vue
@@ -4,10 +4,10 @@
 
 <script lang="ts">
     import { computed, defineComponent, onMounted, ref, toRef, watch } from 'vue';
-    import { useSelect2 } from '@/vstutils/select2';
-    import { FieldEditPropsDef } from '@/vstutils/fields/base';
-    import type { FieldEditPropsDefType } from '@/vstutils/fields/base';
-    import type { SelectedData } from '@/vstutils/select2';
+    import { useSelect2 } from '#vstutils/select2';
+    import { FieldEditPropsDef } from '#vstutils/fields/base';
+    import type { FieldEditPropsDefType } from '#vstutils/fields/base';
+    import type { SelectedData } from '#vstutils/select2';
     import type { ChoicesField } from './ChoicesField';
 
     export default defineComponent({
diff --git a/frontend_src/vstutils/fields/choices/OrderingChoicesField.ts b/frontend_src/vstutils/fields/choices/OrderingChoicesField.ts
index 5865cb57..2a94e7e4 100644
--- a/frontend_src/vstutils/fields/choices/OrderingChoicesField.ts
+++ b/frontend_src/vstutils/fields/choices/OrderingChoicesField.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@/vstutils/translation';
+import { i18n } from '#vstutils/translation';
 import { type RawEnumItem, ChoicesField } from './ChoicesField';
 import { ChoicesArrayFieldMixin } from './array';
 
diff --git a/frontend_src/vstutils/fields/choices/array.ts b/frontend_src/vstutils/fields/choices/array.ts
index 0be956ad..c33f9c95 100644
--- a/frontend_src/vstutils/fields/choices/array.ts
+++ b/frontend_src/vstutils/fields/choices/array.ts
@@ -1,6 +1,6 @@
 import { type Component, defineComponent } from 'vue';
 import ChoicesArrayFieldEdit from './ChoicesArrayFieldEdit.vue';
-import { StringArrayFieldMixin } from '@/vstutils/fields/text/string-array';
+import { StringArrayFieldMixin } from '#vstutils/fields/text/string-array';
 
 export const ChoicesArrayFieldMixin: Component = defineComponent({
     components: {
diff --git a/frontend_src/vstutils/fields/crontab/CrontabFieldContentEdit.vue b/frontend_src/vstutils/fields/crontab/CrontabFieldContentEdit.vue
index 8198ad8b..4a1d08a3 100644
--- a/frontend_src/vstutils/fields/crontab/CrontabFieldContentEdit.vue
+++ b/frontend_src/vstutils/fields/crontab/CrontabFieldContentEdit.vue
@@ -202,11 +202,11 @@
 
             /**
              * Method, that parse value of single crontab element from crontab string.
-             * @param {array} resArr
+             * @param {Array} resArr
              * @param {string} str
              * @param {number} minInt
              * @param {number} maxInt
-             * @return {array}
+             * @return {Array}
              */
             parseItem(resArr, str, minInt, maxInt) {
                 for (let i = minInt; i <= maxInt; i++) {
@@ -401,7 +401,7 @@
             },
             /**
              * Method, that compiles value of single crontab element.
-             * @param {array} resArr
+             * @param {Array} resArr
              * @param {number} minInt
              * @param {number} maxInt
              * @return {string}
diff --git a/frontend_src/vstutils/fields/datetime/__tests__/DateTimeField.test.js b/frontend_src/vstutils/fields/datetime/__tests__/DateTimeField.test.js
index d298ef4a..1786c4cf 100644
--- a/frontend_src/vstutils/fields/datetime/__tests__/DateTimeField.test.js
+++ b/frontend_src/vstutils/fields/datetime/__tests__/DateTimeField.test.js
@@ -1,7 +1,7 @@
 import { DateTimeField } from '../index';
 import { mount } from '@vue/test-utils';
 import moment from 'moment-timezone';
-import { createApp } from '@/unittests/create-app.ts';
+import { createApp } from '#unittests/create-app.ts';
 import VueI18n from 'vue-i18n';
 
 let app;
diff --git a/frontend_src/vstutils/fields/dynamic/DependFromFkField.ts b/frontend_src/vstutils/fields/dynamic/DependFromFkField.ts
index 9ac23228..a6968bbd 100644
--- a/frontend_src/vstutils/fields/dynamic/DependFromFkField.ts
+++ b/frontend_src/vstutils/fields/dynamic/DependFromFkField.ts
@@ -1,5 +1,5 @@
 import DependFromFkFieldMixin from './DependFromFkFieldMixin.vue';
-import type { FieldOptions } from '@/vstutils/fields/base';
+import type { FieldOptions } from '#vstutils/fields/base';
 import type { DynamicFieldXOptions } from './DynamicField';
 import { DynamicField } from './DynamicField';
 
diff --git a/frontend_src/vstutils/fields/dynamic/DependFromFkFieldMixin.vue b/frontend_src/vstutils/fields/dynamic/DependFromFkFieldMixin.vue
index adbc23df..56a8d18b 100644
--- a/frontend_src/vstutils/fields/dynamic/DependFromFkFieldMixin.vue
+++ b/frontend_src/vstutils/fields/dynamic/DependFromFkFieldMixin.vue
@@ -10,7 +10,7 @@
 
 <script setup lang="ts">
     import { watch, ref } from 'vue';
-    import { type FieldPropsDefType, type SetFieldValueOptions, FieldPropsDef } from '@/vstutils/fields/base';
+    import { type FieldPropsDefType, type SetFieldValueOptions, FieldPropsDef } from '#vstutils/fields/base';
     import type { DependFromFkField } from './DependFromFkField';
 
     const props = defineProps(FieldPropsDef as FieldPropsDefType<DependFromFkField>);
diff --git a/frontend_src/vstutils/fields/dynamic/DynamicField.ts b/frontend_src/vstutils/fields/dynamic/DynamicField.ts
index 527c337c..1f3995fd 100644
--- a/frontend_src/vstutils/fields/dynamic/DynamicField.ts
+++ b/frontend_src/vstutils/fields/dynamic/DynamicField.ts
@@ -1,12 +1,12 @@
-import type { Field, FieldOptions, FieldXOptions } from '@/vstutils/fields/base';
-import { BaseField } from '@/vstutils/fields/base';
-import { onAppAfterInit } from '@/vstutils/signals';
+import type { Field, FieldOptions, FieldXOptions } from '#vstutils/fields/base';
+import { BaseField } from '#vstutils/fields/base';
+import { onAppAfterInit } from '#vstutils/signals';
 
 import DynamicFieldMixin from './DynamicFieldMixin.vue';
 
-import type { FieldDefinition } from '@/vstutils/fields/FieldsResolver';
-import type { PageView, BaseView } from '@/vstutils/views';
-import type { InnerData, RepresentData } from '@/vstutils/utils';
+import type { FieldDefinition } from '#vstutils/fields/FieldsResolver';
+import type { PageView, BaseView } from '#vstutils/views';
+import type { InnerData, RepresentData } from '#vstutils/utils';
 
 export interface DynamicFieldXOptions extends FieldXOptions {
     source_view?: string;
diff --git a/frontend_src/vstutils/fields/dynamic/DynamicFieldMixin.vue b/frontend_src/vstutils/fields/dynamic/DynamicFieldMixin.vue
index 1f8186fb..0ba968c0 100644
--- a/frontend_src/vstutils/fields/dynamic/DynamicFieldMixin.vue
+++ b/frontend_src/vstutils/fields/dynamic/DynamicFieldMixin.vue
@@ -13,15 +13,15 @@
 
 <script lang="ts">
     import { computed, defineComponent, ref, watch } from 'vue';
-    import { deepEqual } from '@/vstutils/utils';
+    import { deepEqual } from '#vstutils/utils';
     import type {
         FieldPropsDefType,
         SetFieldValueOptions,
         Field,
         FieldEmitsDefType,
-    } from '@/vstutils/fields/base';
-    import { FieldEmitsDef } from '@/vstutils/fields/base';
-    import { FieldPropsDef } from '@/vstutils/fields/base';
+    } from '#vstutils/fields/base';
+    import { FieldEmitsDef } from '#vstutils/fields/base';
+    import { FieldPropsDef } from '#vstutils/fields/base';
     import type { DynamicField } from './DynamicField';
 
     export default defineComponent({
diff --git a/frontend_src/vstutils/fields/dynamic/__tests__/DependFromFkField.test.js b/frontend_src/vstutils/fields/dynamic/__tests__/DependFromFkField.test.js
index db3aed4d..37a2020e 100644
--- a/frontend_src/vstutils/fields/dynamic/__tests__/DependFromFkField.test.js
+++ b/frontend_src/vstutils/fields/dynamic/__tests__/DependFromFkField.test.js
@@ -5,7 +5,7 @@ import {
     waitForPageLoading,
     openPage,
     expectNthRequest,
-} from '@/unittests';
+} from '#unittests';
 
 const schema = createSchema({
     paths: {
diff --git a/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.js b/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.js
index cc2485c4..20cc398f 100644
--- a/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.js
+++ b/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.js
@@ -1,8 +1,8 @@
-import { createApp } from '@/unittests/create-app';
-import { BooleanField } from '@/vstutils/fields/boolean';
-import { ChoicesField } from '@/vstutils/fields/choices';
-import { StringField } from '@/vstutils/fields/text';
-import { X_OPTIONS } from '@/vstutils/utils';
+import { createApp } from '#unittests/create-app';
+import { BooleanField } from '#vstutils/fields/boolean';
+import { ChoicesField } from '#vstutils/fields/choices';
+import { StringField } from '#vstutils/fields/text';
+import { X_OPTIONS } from '#vstutils/utils';
 import { DynamicField } from '../DynamicField';
 
 describe('DynamicField', () => {
diff --git a/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.ts b/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.ts
index e2dc7934..193437b9 100644
--- a/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.ts
+++ b/frontend_src/vstutils/fields/dynamic/__tests__/DynamicField.test.ts
@@ -1,6 +1,6 @@
-import { StringField } from '@/vstutils/fields/text';
+import { StringField } from '#vstutils/fields/text';
 import { DynamicField } from '../DynamicField';
-import { createApp } from '@/unittests';
+import { createApp } from '#unittests';
 import VueI18n from 'vue-i18n';
 import { nextTick, reactive } from 'vue';
 import { mount } from '@vue/test-utils';
diff --git a/frontend_src/vstutils/fields/dynamic/__tests__/depend-on-parent-view.test.js b/frontend_src/vstutils/fields/dynamic/__tests__/depend-on-parent-view.test.js
index d96182ba..d38c9f21 100644
--- a/frontend_src/vstutils/fields/dynamic/__tests__/depend-on-parent-view.test.js
+++ b/frontend_src/vstutils/fields/dynamic/__tests__/depend-on-parent-view.test.js
@@ -1,7 +1,7 @@
 import { waitFor } from '@testing-library/dom';
-import { expectNthRequest, createApp, createSchema } from '@/unittests';
-import { PhoneField } from '@/vstutils/fields/text/phone';
-import { ColorField } from '@/vstutils/fields/color';
+import { expectNthRequest, createApp, createSchema } from '#unittests';
+import { PhoneField } from '#vstutils/fields/text/phone';
+import { ColorField } from '#vstutils/fields/color';
 import schema from './depend-on-parent-view-schema.json';
 
 test('DynamicField depending on value from parent view', async () => {
diff --git a/frontend_src/vstutils/fields/files/FileInput.vue b/frontend_src/vstutils/fields/files/FileInput.vue
index d9f4cced..9508bf45 100644
--- a/frontend_src/vstutils/fields/files/FileInput.vue
+++ b/frontend_src/vstutils/fields/files/FileInput.vue
@@ -22,8 +22,8 @@
 
 <script setup lang="ts">
     import { computed, ref } from 'vue';
-    import { i18n } from '@/vstutils/translation';
-    import { getUniqueId } from '@/vstutils/utils';
+    import { i18n } from '#vstutils/translation';
+    import { getUniqueId } from '#vstutils/utils';
     import { useDragAndDrop } from './useDragAndDrop';
 
     const props = withDefaults(
diff --git a/frontend_src/vstutils/fields/files/FileNamesEditor.vue b/frontend_src/vstutils/fields/files/FileNamesEditor.vue
index d1be74d8..0cd3ecb2 100644
--- a/frontend_src/vstutils/fields/files/FileNamesEditor.vue
+++ b/frontend_src/vstutils/fields/files/FileNamesEditor.vue
@@ -24,8 +24,8 @@
 
 <script setup lang="ts">
     import { computed, ref, set } from 'vue';
-    import { i18n } from '@/vstutils/translation';
-    import Card from '@/vstutils/components/Card.vue';
+    import { i18n } from '#vstutils/translation';
+    import Card from '#vstutils/components/Card.vue';
 
     const props = defineProps<{
         files: File[];
diff --git a/frontend_src/vstutils/fields/files/FileRenameInput.vue b/frontend_src/vstutils/fields/files/FileRenameInput.vue
index 57f48f46..988b0241 100644
--- a/frontend_src/vstutils/fields/files/FileRenameInput.vue
+++ b/frontend_src/vstutils/fields/files/FileRenameInput.vue
@@ -22,7 +22,7 @@
 
 <script setup lang="ts">
     import { computed, ref } from 'vue';
-    import { i18n } from '@/vstutils/translation';
+    import { i18n } from '#vstutils/translation';
     import type { InputHTMLAttributes } from 'vue/types/jsx';
 
     const props = defineProps<{
diff --git a/frontend_src/vstutils/fields/files/__tests__/files.test.js b/frontend_src/vstutils/fields/files/__tests__/files.test.js
index 8a86392c..839e3b76 100644
--- a/frontend_src/vstutils/fields/files/__tests__/files.test.js
+++ b/frontend_src/vstutils/fields/files/__tests__/files.test.js
@@ -1,6 +1,6 @@
-import { createApp, mount } from '@/unittests';
+import { createApp, mount } from '#unittests';
 import { h } from 'vue';
-import { deferredPromise } from '@/vstutils/utils';
+import { deferredPromise } from '#vstutils/utils';
 
 let app;
 
diff --git a/frontend_src/vstutils/fields/files/binary-file/BinaryFileField.ts b/frontend_src/vstutils/fields/files/binary-file/BinaryFileField.ts
index 90fedef2..33aa76a3 100644
--- a/frontend_src/vstutils/fields/files/binary-file/BinaryFileField.ts
+++ b/frontend_src/vstutils/fields/files/binary-file/BinaryFileField.ts
@@ -1,8 +1,8 @@
-import { FileField, fileIsTooLarge, fileIsTooSmall } from '@/vstutils/fields/files/file';
+import { FileField, fileIsTooLarge, fileIsTooSmall } from '#vstutils/fields/files/file';
 import BinaryFileFieldMixin from './BinaryFileFieldMixin';
 
 import type { ComponentOptions } from 'vue';
-import type { RepresentData } from '@/vstutils/utils';
+import type { RepresentData } from '#vstutils/utils';
 
 /**
  * BinFile guiField class.
diff --git a/frontend_src/vstutils/fields/files/csv-file/CSVFileFieldEdit.vue b/frontend_src/vstutils/fields/files/csv-file/CSVFileFieldEdit.vue
index 00d4192f..4f9958c1 100644
--- a/frontend_src/vstutils/fields/files/csv-file/CSVFileFieldEdit.vue
+++ b/frontend_src/vstutils/fields/files/csv-file/CSVFileFieldEdit.vue
@@ -30,14 +30,14 @@
 <script setup lang="ts">
     import { computed, ref } from 'vue';
 
-    import { i18n } from '@/vstutils/translation';
-    import { readFileAsText } from '@/vstutils/utils';
-    import { FieldEditPropsDef } from '@/vstutils/fields/base';
-    import ConfirmModal from '@/vstutils/components/common/ConfirmModal.vue';
+    import { i18n } from '#vstutils/translation';
+    import { readFileAsText } from '#vstutils/utils';
+    import { FieldEditPropsDef } from '#vstutils/fields/base';
+    import ConfirmModal from '#vstutils/components/common/ConfirmModal.vue';
     import DataTable from './DataTable.vue';
     import FileFieldSelector from '../FileFieldSelector.vue';
 
-    import type { ExtractRepresent, FieldEditPropsDefType } from '@/vstutils/fields/base';
+    import type { ExtractRepresent, FieldEditPropsDefType } from '#vstutils/fields/base';
     import type { CsvFileField } from './index';
 
     const props = defineProps(FieldEditPropsDef as FieldEditPropsDefType<CsvFileField>);
diff --git a/frontend_src/vstutils/fields/files/csv-file/CsvFileFieldReadonly.vue b/frontend_src/vstutils/fields/files/csv-file/CsvFileFieldReadonly.vue
index 29f0a9ef..7f3be3d6 100644
--- a/frontend_src/vstutils/fields/files/csv-file/CsvFileFieldReadonly.vue
+++ b/frontend_src/vstutils/fields/files/csv-file/CsvFileFieldReadonly.vue
@@ -17,7 +17,7 @@
     import { computed, ref } from 'vue';
     import DataTable from './DataTable.vue';
 
-    import type { ExtractRepresent } from '@/vstutils/fields/base';
+    import type { ExtractRepresent } from '#vstutils/fields/base';
     import type { CsvFileField } from './index';
 
     const props = defineProps<{
diff --git a/frontend_src/vstutils/fields/files/csv-file/DataTable.vue b/frontend_src/vstutils/fields/files/csv-file/DataTable.vue
index 60e56eee..2bad765c 100644
--- a/frontend_src/vstutils/fields/files/csv-file/DataTable.vue
+++ b/frontend_src/vstutils/fields/files/csv-file/DataTable.vue
@@ -48,10 +48,10 @@
 
 <script setup lang="ts">
     import { computed, ref } from 'vue';
-    import { i18n } from '@/vstutils/translation';
-    import { guiPopUp } from '@/vstutils/popUp';
-    import BootstrapModal from '@/vstutils/components/BootstrapModal.vue';
-    import type { Model, ModelConstructor } from '@/vstutils/models';
+    import { i18n } from '#vstutils/translation';
+    import { guiPopUp } from '#vstutils/popUp';
+    import BootstrapModal from '#vstutils/components/BootstrapModal.vue';
+    import type { Model, ModelConstructor } from '#vstutils/models';
 
     const props = withDefaults(
         defineProps<{
@@ -125,9 +125,9 @@
     import { defineComponent } from 'vue';
     // @ts-expect-error - no types
     import VueVirtualTable from 'vue-virtual-table';
-    import ModelFields from '@/vstutils/components/page/ModelFields.vue';
-    import type { InnerData } from '@/vstutils/utils';
-    import { getApp } from '@/vstutils/utils';
+    import ModelFields from '#vstutils/components/page/ModelFields.vue';
+    import type { InnerData } from '#vstutils/utils';
+    import { getApp } from '#vstutils/utils';
 
     const CustomVirtualTable = defineComponent({
         mixins: [VueVirtualTable],
diff --git a/frontend_src/vstutils/fields/files/csv-file/__tests__/csv-file.test.js b/frontend_src/vstutils/fields/files/csv-file/__tests__/csv-file.test.js
index 5ec5725d..93bf14a3 100644
--- a/frontend_src/vstutils/fields/files/csv-file/__tests__/csv-file.test.js
+++ b/frontend_src/vstutils/fields/files/csv-file/__tests__/csv-file.test.js
@@ -1,7 +1,7 @@
 import { CsvFileField } from '../index';
 import { getTableConfig } from '../DataTable.vue';
-import { createApp, createSchema } from '@/unittests';
-import { guiPopUp } from '@/vstutils/popUp';
+import { createApp, createSchema } from '#unittests';
+import { guiPopUp } from '#vstutils/popUp';
 
 const tableConfig = [
     { prop: '_index', name: 'Index' },
diff --git a/frontend_src/vstutils/fields/files/csv-file/index.ts b/frontend_src/vstutils/fields/files/csv-file/index.ts
index 509ce1d9..a533db90 100644
--- a/frontend_src/vstutils/fields/files/csv-file/index.ts
+++ b/frontend_src/vstutils/fields/files/csv-file/index.ts
@@ -1,22 +1,22 @@
 import Papa from 'papaparse';
 import { defineComponent } from 'vue';
 
-import { BaseField, BaseFieldMixin } from '@/vstutils/fields/base';
-import { onAppBeforeInit } from '@/vstutils/signals';
-import { emptyInnerData } from '@/vstutils/utils';
+import { BaseField, BaseFieldMixin } from '#vstutils/fields/base';
+import { onAppBeforeInit } from '#vstutils/signals';
+import { emptyInnerData } from '#vstutils/utils';
 
 import { validateSimpleFileLength } from '../file';
 import CsvFileFieldEdit from './CSVFileFieldEdit.vue';
 import CsvFileFieldReadonly from './CsvFileFieldReadonly.vue';
 
 import type { ParseConfig } from 'papaparse';
-import type { FieldOptions, FieldXOptions } from '@/vstutils/fields/base';
-import type { InnerData, RepresentData } from '@/vstutils/utils';
-import type { ModelConstructor } from '@/vstutils/models';
-import type { ModelDefinition } from '@/vstutils/schema';
+import type { FieldOptions, FieldXOptions } from '#vstutils/fields/base';
+import type { InnerData, RepresentData } from '#vstutils/utils';
+import type { ModelConstructor } from '#vstutils/models';
+import type { ModelDefinition } from '#vstutils/schema';
 import type { IFileField } from '../file';
-import { guiPopUp } from '@/vstutils/popUp';
-import { i18n } from '@/vstutils/translation';
+import { guiPopUp } from '#vstutils/popUp';
+import { i18n } from '#vstutils/translation';
 
 export { CsvFileFieldEdit, CsvFileFieldReadonly };
 
diff --git a/frontend_src/vstutils/fields/files/file/FileField.ts b/frontend_src/vstutils/fields/files/file/FileField.ts
index 4e8ca8b1..fa2f1794 100644
--- a/frontend_src/vstutils/fields/files/file/FileField.ts
+++ b/frontend_src/vstutils/fields/files/file/FileField.ts
@@ -1,5 +1,5 @@
-import type { FieldOptions, FieldXOptions } from '@/vstutils/fields/base';
-import { BaseField } from '@/vstutils/fields/base';
+import type { FieldOptions, FieldXOptions } from '#vstutils/fields/base';
+import { BaseField } from '#vstutils/fields/base';
 
 import FileFieldMixin from './FileFieldMixin';
 
diff --git a/frontend_src/vstutils/fields/files/file/FileFieldButtonMixin.ts b/frontend_src/vstutils/fields/files/file/FileFieldButtonMixin.ts
index 61b2323f..68b70d9b 100644
--- a/frontend_src/vstutils/fields/files/file/FileFieldButtonMixin.ts
+++ b/frontend_src/vstutils/fields/files/file/FileFieldButtonMixin.ts
@@ -1,4 +1,4 @@
-import { BaseFieldButton } from '@/vstutils/fields/buttons';
+import { BaseFieldButton } from '#vstutils/fields/buttons';
 
 const FileFieldButtonMixin = {
     extends: BaseFieldButton,
diff --git a/frontend_src/vstutils/fields/files/file/FileFieldContentEdit.vue b/frontend_src/vstutils/fields/files/file/FileFieldContentEdit.vue
index ffb23d31..76fca378 100644
--- a/frontend_src/vstutils/fields/files/file/FileFieldContentEdit.vue
+++ b/frontend_src/vstutils/fields/files/file/FileFieldContentEdit.vue
@@ -22,7 +22,7 @@
 
 <script lang="ts">
     import { defineComponent } from 'vue';
-    import { BaseFieldContentEdit } from '@/vstutils/fields/base';
+    import { BaseFieldContentEdit } from '#vstutils/fields/base';
     import FileFieldReadFileButton from './FileFieldReadFileButton.vue';
 
     export default defineComponent({
diff --git a/frontend_src/vstutils/fields/files/file/FileFieldMixin.ts b/frontend_src/vstutils/fields/files/file/FileFieldMixin.ts
index e118ed8a..c9d3c6cb 100644
--- a/frontend_src/vstutils/fields/files/file/FileFieldMixin.ts
+++ b/frontend_src/vstutils/fields/files/file/FileFieldMixin.ts
@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue';
-import type { FieldPropsDefType } from '@/vstutils/fields/base';
-import { BaseFieldMixin, FieldPropsDef } from '@/vstutils/fields/base';
+import type { FieldPropsDefType } from '#vstutils/fields/base';
+import { BaseFieldMixin, FieldPropsDef } from '#vstutils/fields/base';
 import FileFieldContentEdit from './FileFieldContentEdit.vue';
 import type FileField from './FileField';
 
diff --git a/frontend_src/vstutils/fields/files/file/utils.ts b/frontend_src/vstutils/fields/files/file/utils.ts
index 5f9d2d80..dfbe255a 100644
--- a/frontend_src/vstutils/fields/files/file/utils.ts
+++ b/frontend_src/vstutils/fields/files/file/utils.ts
@@ -1,5 +1,5 @@
-import { i18n } from '@/vstutils/translation';
-import type { Field } from '@/vstutils/fields/base';
+import { i18n } from '#vstutils/translation';
+import type { Field } from '#vstutils/fields/base';
 
 export interface IFileField extends Field {
     allowedMediaTypes: string[] | undefined;
diff --git a/frontend_src/vstutils/fields/files/index.ts b/frontend_src/vstutils/fields/files/index.ts
index 3ef45505..54a2d22c 100644
--- a/frontend_src/vstutils/fields/files/index.ts
+++ b/frontend_src/vstutils/fields/files/index.ts
@@ -1,8 +1,16 @@
-export * as binaryFile from './binary-file';
-export * as file from './file';
-export * as multipleNamedBinaryFile from './multiple-named-binary-file';
-export * as multipleNamedBinaryImage from './multiple-named-binary-image';
-export * as namedBinaryFile from './named-binary-file';
-export * as namedBinaryImage from './named-binary-image';
-export * as secretFile from './SecretFileField';
-export * as csvFile from './csv-file';
+import * as binaryFile from './binary-file';
+export { binaryFile };
+import * as file from './file';
+export { file };
+import * as multipleNamedBinaryFile from './multiple-named-binary-file';
+export { multipleNamedBinaryFile };
+import * as multipleNamedBinaryImage from './multiple-named-binary-image';
+export { multipleNamedBinaryImage };
+import * as namedBinaryFile from './named-binary-file';
+export { namedBinaryFile };
+import * as namedBinaryImage from './named-binary-image';
+export { namedBinaryImage };
+import * as secretFile from './SecretFileField';
+export { secretFile };
+import * as csvFile from './csv-file';
+export { csvFile };
diff --git a/frontend_src/vstutils/fields/files/multiple-named-binary-file/FilesList.vue b/frontend_src/vstutils/fields/files/multiple-named-binary-file/FilesList.vue
index 84668d9a..2dcb143a 100644
--- a/frontend_src/vstutils/fields/files/multiple-named-binary-file/FilesList.vue
+++ b/frontend_src/vstutils/fields/files/multiple-named-binary-file/FilesList.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script setup lang="ts">
-    import { downloadBase64File } from '@/vstutils/utils';
+    import { downloadBase64File } from '#vstutils/utils';
     import type { NamedFile } from '../named-binary-file';
 
     defineProps<{
diff --git a/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileField.ts b/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileField.ts
index 15f3243e..7450445e 100644
--- a/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileField.ts
+++ b/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileField.ts
@@ -1,16 +1,16 @@
-import { BaseField } from '@/vstutils/fields/base';
-import { pop_up_msg } from '@/vstutils/popUp';
-import { i18n } from '@/vstutils/translation';
+import { BaseField } from '#vstutils/fields/base';
+import { pop_up_msg } from '#vstutils/popUp';
+import { i18n } from '#vstutils/translation';
 
 import MultipleNamedBinaryFileFieldMixin from './MultipleNamedBinaryFileFieldMixin';
 
 import type { ComponentOptions } from 'vue';
-import type { FieldOptions } from '@/vstutils/fields/base';
+import type { FieldOptions } from '#vstutils/fields/base';
 import type { NamedFile } from '../named-binary-file';
 import { ensureMediaTypeExists } from '../named-binary-file';
 import type { FileFieldXOptions, IFileField } from '../file';
 import { parseAllowedMediaTypes } from '../file';
-import type { InnerData, RepresentData } from '@/vstutils/utils';
+import type { InnerData, RepresentData } from '#vstutils/utils';
 
 class MultipleNamedBinaryFileField<XOptions extends FileFieldXOptions = FileFieldXOptions>
     extends BaseField<NamedFile[] | string, NamedFile[], XOptions>
diff --git a/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldContentEdit.vue b/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldContentEdit.vue
index d969b2a0..21989ea7 100644
--- a/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldContentEdit.vue
+++ b/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldContentEdit.vue
@@ -15,13 +15,13 @@
 
 <script setup lang="ts">
     import { computed } from 'vue';
-    import { i18n } from '@/vstutils/translation';
-    import { readFileAsObject } from '@/vstutils/utils';
-    import { FieldEditPropsDef } from '@/vstutils/fields/base';
+    import { i18n } from '#vstutils/translation';
+    import { readFileAsObject } from '#vstutils/utils';
+    import { FieldEditPropsDef } from '#vstutils/fields/base';
     import MultipleFilesInput from '../MultipleFilesInput.vue';
     import FilesList from './FilesList.vue';
 
-    import type { ExtractRepresent, FieldEditPropsDefType } from '@/vstutils/fields/base';
+    import type { ExtractRepresent, FieldEditPropsDefType } from '#vstutils/fields/base';
     import type MultipleNamedBinaryFileField from './MultipleNamedBinaryFileField';
 
     const props = defineProps(FieldEditPropsDef as FieldEditPropsDefType<MultipleNamedBinaryFileField>);
diff --git a/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldContentList.vue b/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldContentList.vue
index 094afbcf..bd81f2bb 100644
--- a/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldContentList.vue
+++ b/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldContentList.vue
@@ -11,11 +11,11 @@
 </template>
 
 <script setup lang="ts">
-    import BootstrapModal from '@/vstutils/components/BootstrapModal.vue';
-    import type { ExtractRepresent } from '@/vstutils/fields/base';
+    import BootstrapModal from '#vstutils/components/BootstrapModal.vue';
+    import type { ExtractRepresent } from '#vstutils/fields/base';
     import type MultipleNamedBinaryFileField from './MultipleNamedBinaryFileField';
     import FilesList from './FilesList.vue';
-    import { i18n } from '@/vstutils/translation';
+    import { i18n } from '#vstutils/translation';
     import { computed } from 'vue';
 
     const props = defineProps<{
diff --git a/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldContentReadonly.vue b/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldContentReadonly.vue
index f5368d78..99757f69 100644
--- a/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldContentReadonly.vue
+++ b/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldContentReadonly.vue
@@ -9,10 +9,10 @@
 
 <script setup lang="ts">
     import { computed } from 'vue';
-    import { i18n } from '@/vstutils/translation';
+    import { i18n } from '#vstutils/translation';
     import FilesList from './FilesList.vue';
 
-    import type { ExtractRepresent } from '@/vstutils/fields/base';
+    import type { ExtractRepresent } from '#vstutils/fields/base';
     import type MultipleNamedBinaryFileField from './MultipleNamedBinaryFileField';
 
     const props = defineProps<{
diff --git a/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldMixin.ts b/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldMixin.ts
index 4f58792f..d74103cc 100644
--- a/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldMixin.ts
+++ b/frontend_src/vstutils/fields/files/multiple-named-binary-file/MultipleNamedBinaryFileFieldMixin.ts
@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue';
 
-import { BaseFieldMixin } from '@/vstutils/fields/base';
+import { BaseFieldMixin } from '#vstutils/fields/base';
 
 import MultipleNamedBinaryFileFieldContentEdit from './MultipleNamedBinaryFileFieldContentEdit.vue';
 import MultipleNamedBinaryFileFieldContentList from './MultipleNamedBinaryFileFieldContentList.vue';
diff --git a/frontend_src/vstutils/fields/files/multiple-named-binary-image/Carousel.vue b/frontend_src/vstutils/fields/files/multiple-named-binary-image/Carousel.vue
index 5503fc84..ba6a4cd7 100644
--- a/frontend_src/vstutils/fields/files/multiple-named-binary-image/Carousel.vue
+++ b/frontend_src/vstutils/fields/files/multiple-named-binary-image/Carousel.vue
@@ -41,8 +41,8 @@
 
 <script setup lang="ts">
     import { useEventListener } from '@vueuse/core';
-    import { makeDataImageUrl } from '@/vstutils/utils';
-    import BootstrapModal from '@/vstutils/components/BootstrapModal.vue';
+    import { makeDataImageUrl } from '#vstutils/utils';
+    import BootstrapModal from '#vstutils/components/BootstrapModal.vue';
     import type { NamedFile } from '../named-binary-file';
     import { computed, ref } from 'vue';
 
diff --git a/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageField.ts b/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageField.ts
index 0848836a..7856d58d 100644
--- a/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageField.ts
+++ b/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageField.ts
@@ -3,7 +3,7 @@ import { ResolutionValidatorConfig } from '../named-binary-image';
 import MultipleNamedBinaryImageFieldMixin from './MultipleNamedBinaryImageFieldMixin';
 
 import type { ComponentOptions } from 'vue';
-import type { FieldOptions } from '@/vstutils/fields/base';
+import type { FieldOptions } from '#vstutils/fields/base';
 import type { IImageField, NamedBinaryImageFieldXOptions } from '../named-binary-image';
 import type { NamedFile } from '../named-binary-file';
 
diff --git a/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldContentEdit.vue b/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldContentEdit.vue
index eb7b719a..8840bfb7 100644
--- a/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldContentEdit.vue
+++ b/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldContentEdit.vue
@@ -27,13 +27,13 @@
 
 <script setup lang="ts">
     import { computed } from 'vue';
-    import { i18n } from '@/vstutils/translation';
-    import { FieldEditPropsDef } from '@/vstutils/fields/base';
+    import { i18n } from '#vstutils/translation';
+    import { FieldEditPropsDef } from '#vstutils/fields/base';
     import { ResolutionValidatorModal, useResolutionValidator } from '../named-binary-image';
     import MultipleFilesInput from '../MultipleFilesInput.vue';
     import Carousel from './Carousel.vue';
 
-    import type { ExtractRepresent, FieldEditPropsDefType } from '@/vstutils/fields/base';
+    import type { ExtractRepresent, FieldEditPropsDefType } from '#vstutils/fields/base';
     import type { NamedFile } from '../named-binary-file';
     import type MultipleNamedBinaryImageField from './MultipleNamedBinaryImageField';
 
diff --git a/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldContentReadonly.vue b/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldContentReadonly.vue
index e5bb5ed9..019cafd2 100644
--- a/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldContentReadonly.vue
+++ b/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldContentReadonly.vue
@@ -9,10 +9,10 @@
 
 <script setup lang="ts">
     import { computed } from 'vue';
-    import { i18n } from '@/vstutils/translation';
+    import { i18n } from '#vstutils/translation';
     import Carousel from './Carousel.vue';
 
-    import type { ExtractRepresent } from '@/vstutils/fields/base';
+    import type { ExtractRepresent } from '#vstutils/fields/base';
     import type MultipleNamedBinaryImageField from './MultipleNamedBinaryImageField';
 
     const props = defineProps<{
diff --git a/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldListView.vue b/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldListView.vue
index c4160843..7a422251 100644
--- a/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldListView.vue
+++ b/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldListView.vue
@@ -24,11 +24,11 @@
 
 <script setup lang="ts">
     import { computed, ref } from 'vue';
-    import { makeDataImageUrl } from '@/vstutils/utils';
-    import BootstrapModal from '@/vstutils/components/BootstrapModal.vue';
+    import { makeDataImageUrl } from '#vstutils/utils';
+    import BootstrapModal from '#vstutils/components/BootstrapModal.vue';
 
     import type MultipleNamedBinaryImageField from './MultipleNamedBinaryImageField';
-    import type { ExtractRepresent } from '@/vstutils/fields/base';
+    import type { ExtractRepresent } from '#vstutils/fields/base';
 
     const props = defineProps<{
         field: MultipleNamedBinaryImageField;
diff --git a/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldMixin.ts b/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldMixin.ts
index dc361d1d..6463c58f 100644
--- a/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldMixin.ts
+++ b/frontend_src/vstutils/fields/files/multiple-named-binary-image/MultipleNamedBinaryImageFieldMixin.ts
@@ -1,5 +1,5 @@
 import { defineComponent } from 'vue';
-import { BaseFieldMixin } from '@/vstutils/fields/base';
+import { BaseFieldMixin } from '#vstutils/fields/base';
 import MultipleNamedBinaryImageFieldContentReadonly from './MultipleNamedBinaryImageFieldContentReadonly.vue';
 import MultipleNamedBinaryImageFieldContentEdit from './MultipleNamedBinaryImageFieldContentEdit.vue';
 import MultipleNamedBinaryImageFieldListView from './MultipleNamedBinaryImageFieldListView.vue';
diff --git a/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileField.ts b/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileField.ts
index 16a7d6f3..24ead275 100644
--- a/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileField.ts
+++ b/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileField.ts
@@ -1,7 +1,7 @@
-import type { FieldOptions } from '@/vstutils/fields/base';
-import { BaseField } from '@/vstutils/fields/base';
-import { pop_up_msg } from '@/vstutils/popUp';
-import { i18n } from '@/vstutils/translation';
+import type { FieldOptions } from '#vstutils/fields/base';
+import { BaseField } from '#vstutils/fields/base';
+import { pop_up_msg } from '#vstutils/popUp';
+import { i18n } from '#vstutils/translation';
 
 import { parseAllowedMediaTypes } from '../file';
 import NamedBinaryFileFieldMixin from './NamedBinaryFileFieldMixin';
@@ -9,7 +9,7 @@ import NamedBinaryFileFieldMixin from './NamedBinaryFileFieldMixin';
 import type { FileFieldXOptions, IFileField } from '../file';
 import type { NamedFile } from './utils';
 import { ensureMediaTypeExists, validateNamedFileJson } from './utils';
-import type { InnerData, RepresentData } from '@/vstutils/utils';
+import type { InnerData, RepresentData } from '#vstutils/utils';
 
 /**
  * This field takes and returns JSON with 3 properties:
diff --git a/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileFieldContentEdit.vue b/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileFieldContentEdit.vue
index 464eaeea..f196613a 100644
--- a/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileFieldContentEdit.vue
+++ b/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileFieldContentEdit.vue
@@ -12,12 +12,12 @@
 
 <script setup lang="ts">
     import { toRef } from 'vue';
-    import { readFileAsObject } from '@/vstutils/utils';
-    import { FieldEditPropsDef } from '@/vstutils/fields/base';
+    import { readFileAsObject } from '#vstutils/utils';
+    import { FieldEditPropsDef } from '#vstutils/fields/base';
     import SingleFileInput from '../SingleFileInput.vue';
     import { useNamedFileText, validateNamedFilesContentSize } from './utils';
 
-    import type { ExtractRepresent, FieldEditPropsDefType } from '@/vstutils/fields/base';
+    import type { ExtractRepresent, FieldEditPropsDefType } from '#vstutils/fields/base';
     import type NamedBinaryFileField from './NamedBinaryFileField';
 
     const props = defineProps(FieldEditPropsDef as FieldEditPropsDefType<NamedBinaryFileField>);
diff --git a/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileFieldMixin.ts b/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileFieldMixin.ts
index 6a91c02e..198c58d0 100644
--- a/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileFieldMixin.ts
+++ b/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileFieldMixin.ts
@@ -1,4 +1,4 @@
-import { BaseFieldMixin } from '@/vstutils/fields/base';
+import { BaseFieldMixin } from '#vstutils/fields/base';
 import { defineComponent } from 'vue';
 
 import NamedBinaryFileFieldContentEdit from './NamedBinaryFileFieldContentEdit.vue';
diff --git a/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileFieldReadonly.vue b/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileFieldReadonly.vue
index 14ee3fe3..cdf78290 100644
--- a/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileFieldReadonly.vue
+++ b/frontend_src/vstutils/fields/files/named-binary-file/NamedBinaryFileFieldReadonly.vue
@@ -4,8 +4,8 @@
 
 <script setup lang="ts">
     import { computed, toRef } from 'vue';
-    import { makeDataImageUrl } from '@/vstutils/utils';
-    import type { ExtractRepresent } from '@/vstutils/fields/base';
+    import { makeDataImageUrl } from '#vstutils/utils';
+    import type { ExtractRepresent } from '#vstutils/fields/base';
     import type NamedBinaryFileField from './NamedBinaryFileField';
     import { useNamedFileText } from './utils';
 
diff --git a/frontend_src/vstutils/fields/files/named-binary-file/utils.ts b/frontend_src/vstutils/fields/files/named-binary-file/utils.ts
index d7980c55..9327514c 100644
--- a/frontend_src/vstutils/fields/files/named-binary-file/utils.ts
+++ b/frontend_src/vstutils/fields/files/named-binary-file/utils.ts
@@ -1,8 +1,8 @@
 import { computed } from 'vue';
-import { i18n } from '@/vstutils/translation';
-import { guiPopUp } from '@/vstutils/popUp';
+import { i18n } from '#vstutils/translation';
+import { guiPopUp } from '#vstutils/popUp';
 import type { Ref } from 'vue';
-import type { Field } from '@/vstutils/fields/base';
+import type { Field } from '#vstutils/fields/base';
 import { fileIsTooLarge, fileIsTooSmall } from '../file';
 
 export interface NamedFile {
diff --git a/frontend_src/vstutils/fields/files/named-binary-image/ImageBlock.vue b/frontend_src/vstutils/fields/files/named-binary-image/ImageBlock.vue
index 5ffc2248..e6aa2b29 100644
--- a/frontend_src/vstutils/fields/files/named-binary-image/ImageBlock.vue
+++ b/frontend_src/vstutils/fields/files/named-binary-image/ImageBlock.vue
@@ -13,11 +13,11 @@
 
 <script setup lang="ts">
     import { computed } from 'vue';
-    import { i18n } from '@/vstutils/translation';
-    import { makeDataImageUrl } from '@/vstutils/utils';
-    import BootstrapModal from '@/vstutils/components/BootstrapModal.vue';
+    import { i18n } from '#vstutils/translation';
+    import { makeDataImageUrl } from '#vstutils/utils';
+    import BootstrapModal from '#vstutils/components/BootstrapModal.vue';
     import type { CSSProperties } from 'vue/types/jsx';
-    import type { Field } from '@/vstutils/fields/base';
+    import type { Field } from '#vstutils/fields/base';
     import type { NamedFile } from '../named-binary-file';
 
     const props = defineProps<{
diff --git a/frontend_src/vstutils/fields/files/named-binary-image/NamedBinaryImageFieldContentEdit.vue b/frontend_src/vstutils/fields/files/named-binary-image/NamedBinaryImageFieldContentEdit.vue
index 7e0d38bd..027818d0 100644
--- a/frontend_src/vstutils/fields/files/named-binary-image/NamedBinaryImageFieldContentEdit.vue
+++ b/frontend_src/vstutils/fields/files/named-binary-image/NamedBinaryImageFieldContentEdit.vue
@@ -28,14 +28,14 @@
 
 <script setup lang="ts">
     import { computed, toRef } from 'vue';
-    import { FieldEditPropsDef } from '@/vstutils/fields/base';
+    import { FieldEditPropsDef } from '#vstutils/fields/base';
     import { useNamedFileText } from '../named-binary-file';
     import ImageBlock from './ImageBlock.vue';
     import { useResolutionValidator } from './useResolutionValidator';
     import ResolutionValidatorModal from './ResolutionValidatorModal.vue';
     import SingleFileInput from '../SingleFileInput.vue';
 
-    import type { ExtractRepresent, FieldEditPropsDefType } from '@/vstutils/fields/base';
+    import type { ExtractRepresent, FieldEditPropsDefType } from '#vstutils/fields/base';
     import type { NamedFile } from '../named-binary-file';
     import type NamedBinaryImageField from './NamedBinaryImageField';
 
diff --git a/frontend_src/vstutils/fields/files/named-binary-image/NamedBinaryImageFieldContentReadonly.vue b/frontend_src/vstutils/fields/files/named-binary-image/NamedBinaryImageFieldContentReadonly.vue
index 3972d0bd..2fa1df79 100644
--- a/frontend_src/vstutils/fields/files/named-binary-image/NamedBinaryImageFieldContentReadonly.vue
+++ b/frontend_src/vstutils/fields/files/named-binary-image/NamedBinaryImageFieldContentReadonly.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script setup lang="ts">
-    import type { ExtractRepresent } from '@/vstutils/fields/base';
+    import type { ExtractRepresent } from '#vstutils/fields/base';
     import type NamedBinaryImageField from './NamedBinaryImageField';
     import ImageBlock from './ImageBlock.vue';
 
diff --git a/frontend_src/vstutils/fields/files/named-binary-image/NamedBinaryImageFieldMixin.ts b/frontend_src/vstutils/fields/files/named-binary-image/NamedBinaryImageFieldMixin.ts
index 4d9248a3..ed0d0b02 100644
--- a/frontend_src/vstutils/fields/files/named-binary-image/NamedBinaryImageFieldMixin.ts
+++ b/frontend_src/vstutils/fields/files/named-binary-image/NamedBinaryImageFieldMixin.ts
@@ -1,5 +1,5 @@
 import { defineComponent } from 'vue';
-import { BaseFieldMixin } from '@/vstutils/fields/base';
+import { BaseFieldMixin } from '#vstutils/fields/base';
 import NamedBinaryImageFieldContentReadonly from './NamedBinaryImageFieldContentReadonly.vue';
 import NamedBinaryImageFieldContentEdit from './NamedBinaryImageFieldContentEdit.vue';
 
diff --git a/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorImage.vue b/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorImage.vue
index 1315fb23..79ed12a0 100644
--- a/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorImage.vue
+++ b/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorImage.vue
@@ -71,9 +71,9 @@
 
 <script setup lang="ts">
     import { ref, computed, reactive } from 'vue';
-    import { i18n } from '@/vstutils/translation';
-    import { makeDataImageUrl, readFileAsDataUrl } from '@/vstutils/utils';
-    import type { NamedFile } from '@/vstutils/fields/files/named-binary-file';
+    import { i18n } from '#vstutils/translation';
+    import { makeDataImageUrl, readFileAsDataUrl } from '#vstutils/utils';
+    import type { NamedFile } from '#vstutils/fields/files/named-binary-file';
     import type ResolutionValidatorConfig from './ResolutionValidatorConfig';
     import type { IImageField } from './NamedBinaryImageField';
     import Cropper from 'cropperjs';
diff --git a/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorModal.vue b/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorModal.vue
index b2e0b04a..e8b54af4 100644
--- a/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorModal.vue
+++ b/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorModal.vue
@@ -18,9 +18,9 @@
 
 <script setup lang="ts">
     import { ref, computed, onMounted } from 'vue';
-    import BootstrapModal from '@/vstutils/components/BootstrapModal.vue';
+    import BootstrapModal from '#vstutils/components/BootstrapModal.vue';
     import ResolutionValidatorImage from './ResolutionValidatorImage.vue';
-    import type { NamedFile } from '@/vstutils/fields/files/named-binary-file';
+    import type { NamedFile } from '#vstutils/fields/files/named-binary-file';
     import type { IImageField } from './NamedBinaryImageField';
 
     const props = defineProps<{
diff --git a/frontend_src/vstutils/fields/files/named-binary-image/useResolutionValidator.ts b/frontend_src/vstutils/fields/files/named-binary-image/useResolutionValidator.ts
index 894c6a0d..f389c7d2 100644
--- a/frontend_src/vstutils/fields/files/named-binary-image/useResolutionValidator.ts
+++ b/frontend_src/vstutils/fields/files/named-binary-image/useResolutionValidator.ts
@@ -1,8 +1,8 @@
 import { ref } from 'vue';
 
-import { guiPopUp } from '@/vstutils/popUp';
-import { i18n } from '@/vstutils/translation';
-import { loadImage, makeDataImageUrl, readFileAsObject } from '@/vstutils/utils';
+import { guiPopUp } from '#vstutils/popUp';
+import { i18n } from '#vstutils/translation';
+import { loadImage, makeDataImageUrl, readFileAsObject } from '#vstutils/utils';
 import { validateNamedFilesContentSize } from '../named-binary-file';
 
 import type { NamedFile } from '../named-binary-file';
diff --git a/frontend_src/vstutils/fields/fk/__tests__/DeepFKField.test.js b/frontend_src/vstutils/fields/fk/__tests__/DeepFKField.test.js
index 2f685285..39b9a2a2 100644
--- a/frontend_src/vstutils/fields/fk/__tests__/DeepFKField.test.js
+++ b/frontend_src/vstutils/fields/fk/__tests__/DeepFKField.test.js
@@ -1,7 +1,7 @@
 import { reactive } from 'vue';
 import { within } from '@testing-library/dom';
 import { userEvent } from '@testing-library/user-event';
-import { createApp, createSchema, waitFor, mount } from '@/unittests';
+import { createApp, createSchema, waitFor, mount } from '#unittests';
 import schema from './DeepFKField-schema.json';
 
 describe('DeepFKfield', () => {
diff --git a/frontend_src/vstutils/fields/fk/autocomplete/FKAutocompleteField.ts b/frontend_src/vstutils/fields/fk/autocomplete/FKAutocompleteField.ts
index f71e8c7e..fef93407 100644
--- a/frontend_src/vstutils/fields/fk/autocomplete/FKAutocompleteField.ts
+++ b/frontend_src/vstutils/fields/fk/autocomplete/FKAutocompleteField.ts
@@ -1,8 +1,8 @@
 import type { ComponentOptions } from 'vue';
 import { FKField } from '../fk/FKField';
 import FKAutocompleteFieldMixin from './FKAutocompleteFieldMixin';
-import type { FieldOptions } from '@/vstutils/fields/base';
-import type { FKFieldXOptions, TInner } from '@/vstutils/fields/fk/fk/FKField';
+import type { FieldOptions } from '#vstutils/fields/base';
+import type { FKFieldXOptions, TInner } from '#vstutils/fields/fk/fk/FKField';
 
 /**
  * FkField with autocomplete feature for GUI.
diff --git a/frontend_src/vstutils/fields/fk/autocomplete/FKAutocompleteFieldContentEdit.vue b/frontend_src/vstutils/fields/fk/autocomplete/FKAutocompleteFieldContentEdit.vue
index 1d50c5d1..5fe1e88e 100644
--- a/frontend_src/vstutils/fields/fk/autocomplete/FKAutocompleteFieldContentEdit.vue
+++ b/frontend_src/vstutils/fields/fk/autocomplete/FKAutocompleteFieldContentEdit.vue
@@ -18,17 +18,17 @@
 
 <script lang="ts">
     import { defineComponent, onMounted, ref, toRef, watch } from 'vue';
-    import { useAutocompleteDropdown } from '@/vstutils/fields/autocomplete';
-    import { BaseFieldContentEdit, FieldEditPropsDef } from '@/vstutils/fields/base';
-    import { escapeHtml, getDependenceValueAsString, guiLocalSettings, RequestTypes } from '@/vstutils/utils';
-    import { signals } from '@/vstutils/signals';
-    import { useQuerySets } from '@/vstutils/fields/fk/fk';
+    import { useAutocompleteDropdown } from '#vstutils/fields/autocomplete';
+    import { BaseFieldContentEdit, FieldEditPropsDef } from '#vstutils/fields/base';
+    import { escapeHtml, getDependenceValueAsString, guiLocalSettings, RequestTypes } from '#vstutils/utils';
+    import { signals } from '#vstutils/signals';
+    import { useQuerySets } from '#vstutils/fields/fk/fk';
 
-    import type { ExtractRepresent, FieldEditPropsDefType } from '@/vstutils/fields/base';
+    import type { ExtractRepresent, FieldEditPropsDefType } from '#vstutils/fields/base';
     import type FKAutocompleteField from './FKAutocompleteField';
-    import type { QuerySet } from '@/vstutils/querySet';
-    import type { Model } from '@/vstutils/models';
-    import type { InnerData } from '@/vstutils/utils';
+    import type { QuerySet } from '#vstutils/querySet';
+    import type { Model } from '#vstutils/models';
+    import type { InnerData } from '#vstutils/utils';
 
     type Repr = ExtractRepresent<FKAutocompleteField>;
 
diff --git a/frontend_src/vstutils/fields/fk/deep-fk/DeepFKFieldContentEditable.vue b/frontend_src/vstutils/fields/fk/deep-fk/DeepFKFieldContentEditable.vue
index e1d99726..95a324af 100644
--- a/frontend_src/vstutils/fields/fk/deep-fk/DeepFKFieldContentEditable.vue
+++ b/frontend_src/vstutils/fields/fk/deep-fk/DeepFKFieldContentEditable.vue
@@ -9,7 +9,7 @@
         type FieldEditPropsDefType,
         type FieldEditEmitsDefType,
         type SetFieldValueParams,
-    } from '@/vstutils/fields/base';
+    } from '#vstutils/fields/base';
     import type DeepFKField from './DeepFKField';
     import FkTree from './FkTree.vue';
 
diff --git a/frontend_src/vstutils/fields/fk/deep-fk/DeepFkArrayFieldEdit.vue b/frontend_src/vstutils/fields/fk/deep-fk/DeepFkArrayFieldEdit.vue
index f1af1366..b4abf6d8 100644
--- a/frontend_src/vstutils/fields/fk/deep-fk/DeepFkArrayFieldEdit.vue
+++ b/frontend_src/vstutils/fields/fk/deep-fk/DeepFkArrayFieldEdit.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-    import { BaseFieldContentEdit } from '@/vstutils/fields/base';
+    import { BaseFieldContentEdit } from '#vstutils/fields/base';
     import FkTree from './FkTree.vue';
 
     export default {
diff --git a/frontend_src/vstutils/fields/fk/deep-fk/FkTree.vue b/frontend_src/vstutils/fields/fk/deep-fk/FkTree.vue
index bd81fb3f..c039920d 100644
--- a/frontend_src/vstutils/fields/fk/deep-fk/FkTree.vue
+++ b/frontend_src/vstutils/fields/fk/deep-fk/FkTree.vue
@@ -52,8 +52,8 @@
     import { ref, computed, onMounted, nextTick, shallowRef } from 'vue';
     // @ts-expect-error liquor-tree has no types
     import * as LiquorTree from 'liquor-tree';
-    import { i18n } from '@/vstutils/translation';
-    import { type Model } from '@/vstutils/models';
+    import { i18n } from '#vstutils/translation';
+    import { type Model } from '#vstutils/models';
     import type DeepFKField from './DeepFKField';
     import { type SetFieldValueParams } from '../../base';
 
diff --git a/frontend_src/vstutils/fields/fk/deep-fk/array.ts b/frontend_src/vstutils/fields/fk/deep-fk/array.ts
index 0c2dadd6..c265e06f 100644
--- a/frontend_src/vstutils/fields/fk/deep-fk/array.ts
+++ b/frontend_src/vstutils/fields/fk/deep-fk/array.ts
@@ -1,5 +1,5 @@
 import { defineComponent } from 'vue';
-import { ArrayFieldMixin } from '@/vstutils/fields/array/mixins';
+import { ArrayFieldMixin } from '#vstutils/fields/array/mixins';
 import DeepFkArrayFieldEdit from './DeepFkArrayFieldEdit.vue';
 
 export const DeepFkArrayFieldMixin = defineComponent({
diff --git a/frontend_src/vstutils/fields/fk/fk/FKField.ts b/frontend_src/vstutils/fields/fk/fk/FKField.ts
index 67bce55f..f43b3ffb 100644
--- a/frontend_src/vstutils/fields/fk/fk/FKField.ts
+++ b/frontend_src/vstutils/fields/fk/fk/FKField.ts
@@ -1,19 +1,19 @@
-import { BaseField } from '@/vstutils/fields/base';
-import { onAppBeforeInit } from '@/vstutils/signals';
-import { i18n } from '@/vstutils/translation';
-import { type RepresentData, OBJECT_NOT_FOUND_TEXT } from '@/vstutils/utils';
-import { formatPath, getApp, getDependenceValueAsString, RequestTypes } from '@/vstutils/utils';
+import { BaseField } from '#vstutils/fields/base';
+import { onAppBeforeInit } from '#vstutils/signals';
+import { i18n } from '#vstutils/translation';
+import { type RepresentData, OBJECT_NOT_FOUND_TEXT } from '#vstutils/utils';
+import { formatPath, getApp, getDependenceValueAsString, RequestTypes } from '#vstutils/utils';
 
 import FKFieldMixin from './FKFieldMixin';
 import { FKArrayFieldMixin } from './array';
 
 import type { Component, ComponentOptions } from 'vue';
-import type { ModelDefinition } from '@/vstutils/schema';
-import type { FieldOptions, FieldXOptions } from '@/vstutils/fields/base';
-import type { PageView, ViewStore } from '@/vstutils/views';
-import type { Model, ModelConstructor } from '@/vstutils/models';
-import type { QuerySet } from '@/vstutils/querySet';
-import type { IFetchableField } from '@/vstutils/fetch-values';
+import type { ModelDefinition } from '#vstutils/schema';
+import type { FieldOptions, FieldXOptions } from '#vstutils/fields/base';
+import type { PageView, ViewStore } from '#vstutils/views';
+import type { Model, ModelConstructor } from '#vstutils/models';
+import type { QuerySet } from '#vstutils/querySet';
+import type { IFetchableField } from '#vstutils/fetch-values';
 
 const dependenceTemplateRegexp = /<<\w+>>/g;
 
diff --git a/frontend_src/vstutils/fields/fk/fk/FKFieldContent.js b/frontend_src/vstutils/fields/fk/fk/FKFieldContent.js
index a462ffea..6c5c0dae 100644
--- a/frontend_src/vstutils/fields/fk/fk/FKFieldContent.js
+++ b/frontend_src/vstutils/fields/fk/fk/FKFieldContent.js
@@ -1,5 +1,5 @@
 import { defineComponent } from 'vue';
-import { formatPath } from '@/vstutils/utils';
+import { formatPath } from '#vstutils/utils';
 
 /**
  * Mixin for content components of FK field.
diff --git a/frontend_src/vstutils/fields/fk/fk/FKFieldContentEditable.vue b/frontend_src/vstutils/fields/fk/fk/FKFieldContentEditable.vue
index e243fc68..b0767598 100644
--- a/frontend_src/vstutils/fields/fk/fk/FKFieldContentEditable.vue
+++ b/frontend_src/vstutils/fields/fk/fk/FKFieldContentEditable.vue
@@ -11,13 +11,13 @@
 </template>
 
 <script lang="ts">
-    import $ from '@/libs/jquery';
+    import $ from '#libs/jquery';
     import { toRef, ref, defineComponent } from 'vue';
     import { createTransport } from './transport';
     import { ensureValueFetched, useQuerySets } from './composables';
-    import { FieldEditPropsDef } from '@/vstutils/fields/base';
-    import { HideButton } from '@/vstutils/fields/buttons';
-    import type { FieldEditPropsDefType } from '@/vstutils/fields/base';
+    import { FieldEditPropsDef } from '#vstutils/fields/base';
+    import { HideButton } from '#vstutils/fields/buttons';
+    import type { FieldEditPropsDefType } from '#vstutils/fields/base';
     import type { FKField, TRepresent } from './FKField';
 
     export default defineComponent({
diff --git a/frontend_src/vstutils/fields/fk/fk/FKFieldContentReadonly.vue b/frontend_src/vstutils/fields/fk/fk/FKFieldContentReadonly.vue
index 38aec223..9e78a5da 100644
--- a/frontend_src/vstutils/fields/fk/fk/FKFieldContentReadonly.vue
+++ b/frontend_src/vstutils/fields/fk/fk/FKFieldContentReadonly.vue
@@ -29,11 +29,11 @@
 <script setup lang="ts">
     import { computed, toRef } from 'vue';
     import { ensureValueFetched, useQuerySets } from './composables';
-    import { FieldReadonlyPropsDef } from '@/vstutils/fields/base';
-    import { getApp } from '@/vstutils/utils';
+    import { FieldReadonlyPropsDef } from '#vstutils/fields/base';
+    import { getApp } from '#vstutils/utils';
 
-    import type { Model } from '@/vstutils/models';
-    import type { FieldReadonlyPropsDefType } from '@/vstutils/fields/base';
+    import type { Model } from '#vstutils/models';
+    import type { FieldReadonlyPropsDefType } from '#vstutils/fields/base';
     import type { FKField } from './FKField';
 
     const props = defineProps(FieldReadonlyPropsDef as FieldReadonlyPropsDefType<FKField>);
diff --git a/frontend_src/vstutils/fields/fk/fk/FKFieldMixin.ts b/frontend_src/vstutils/fields/fk/fk/FKFieldMixin.ts
index 1bc66640..0fbd6580 100644
--- a/frontend_src/vstutils/fields/fk/fk/FKFieldMixin.ts
+++ b/frontend_src/vstutils/fields/fk/fk/FKFieldMixin.ts
@@ -1,5 +1,5 @@
 import { defineComponent } from 'vue';
-import { BaseFieldMixin } from '@/vstutils/fields/base';
+import { BaseFieldMixin } from '#vstutils/fields/base';
 import FKFieldContentEditable from './FKFieldContentEditable.vue';
 import FKFieldContentReadonly from './FKFieldContentReadonly.vue';
 
diff --git a/frontend_src/vstutils/fields/fk/fk/__tests__/FKField-value-fetch.test.js b/frontend_src/vstutils/fields/fk/fk/__tests__/FKField-value-fetch.test.js
index 14604e07..0b36c615 100644
--- a/frontend_src/vstutils/fields/fk/fk/__tests__/FKField-value-fetch.test.js
+++ b/frontend_src/vstutils/fields/fk/fk/__tests__/FKField-value-fetch.test.js
@@ -1,5 +1,5 @@
-import { createApp, mount } from '@/unittests';
-import { deferredPromise } from '@/vstutils/utils';
+import { createApp, mount } from '#unittests';
+import { deferredPromise } from '#vstutils/utils';
 
 describe('FKField value loader indicator', () => {
     let app;
diff --git a/frontend_src/vstutils/fields/fk/fk/__tests__/not-available-fk-model-selected.test.js b/frontend_src/vstutils/fields/fk/fk/__tests__/not-available-fk-model-selected.test.js
index 118e0d37..6cc06d41 100644
--- a/frontend_src/vstutils/fields/fk/fk/__tests__/not-available-fk-model-selected.test.js
+++ b/frontend_src/vstutils/fields/fk/fk/__tests__/not-available-fk-model-selected.test.js
@@ -1,4 +1,4 @@
-import { createApp, createSchema, schemaListOf } from '@/unittests';
+import { createApp, createSchema, schemaListOf } from '#unittests';
 
 test('app will return an error if the path for the FK request is not found', async () => {
     const fk = {
diff --git a/frontend_src/vstutils/fields/fk/fk/array.ts b/frontend_src/vstutils/fields/fk/fk/array.ts
index 2b36168a..9cb12ed8 100644
--- a/frontend_src/vstutils/fields/fk/fk/array.ts
+++ b/frontend_src/vstutils/fields/fk/fk/array.ts
@@ -1,15 +1,15 @@
 import $ from 'jquery';
 import { toRef, defineComponent, h } from 'vue';
-import { fetchPKs } from '@/vstutils/fetch-values';
-import { FieldEditPropsDef } from '@/vstutils/fields/base';
-import { createTransport, useQuerySets } from '@/vstutils/fields/fk/fk';
-import { ArrayFieldMixin } from '@/vstutils/fields/array/mixins';
+import { fetchPKs } from '#vstutils/fetch-values';
+import { FieldEditPropsDef } from '#vstutils/fields/base';
+import { createTransport, useQuerySets } from '#vstutils/fields/fk/fk';
+import { ArrayFieldMixin } from '#vstutils/fields/array/mixins';
 
 import type { PropType } from 'vue';
-import type { ExtractRepresent, FieldEditPropsDefType } from '@/vstutils/fields/base';
-import type { FKField } from '@/vstutils/fields/fk/fk/FKField';
-import type { ArrayField } from '@/vstutils/fields/array/ArrayField';
-import type { Model } from '@/vstutils/models';
+import type { ExtractRepresent, FieldEditPropsDefType } from '#vstutils/fields/base';
+import type { FKField } from '#vstutils/fields/fk/fk/FKField';
+import type { ArrayField } from '#vstutils/fields/array/ArrayField';
+import type { Model } from '#vstutils/models';
 
 type TRepresent = ExtractRepresent<FKField>;
 
diff --git a/frontend_src/vstutils/fields/fk/fk/composables.ts b/frontend_src/vstutils/fields/fk/fk/composables.ts
index 8e521125..5968edb5 100644
--- a/frontend_src/vstutils/fields/fk/fk/composables.ts
+++ b/frontend_src/vstutils/fields/fk/fk/composables.ts
@@ -1,6 +1,6 @@
 import { computed, getCurrentInstance, readonly, ref, watch } from 'vue';
-import { fetchPKs } from '@/vstutils/fetch-values';
-import { getApp } from '@/vstutils/utils';
+import { fetchPKs } from '#vstutils/fetch-values';
+import { getApp } from '#vstutils/utils';
 
 import type { Ref } from 'vue';
 import type { FKField, TRepresent } from './FKField';
diff --git a/frontend_src/vstutils/fields/fk/fk/transport.ts b/frontend_src/vstutils/fields/fk/fk/transport.ts
index 7d604abb..da34eab5 100644
--- a/frontend_src/vstutils/fields/fk/fk/transport.ts
+++ b/frontend_src/vstutils/fields/fk/fk/transport.ts
@@ -1,12 +1,12 @@
 import type { Ref } from 'vue';
 
-import { createInstancesList } from '@/vstutils/models';
-import { signals } from '@/vstutils/signals';
+import { createInstancesList } from '#vstutils/models';
+import { signals } from '#vstutils/signals';
 
 import type { FKField } from './FKField';
-import type { InstancesList, Model } from '@/vstutils/models';
-import type { QuerySet } from '@/vstutils/querySet';
-import type { RepresentData } from '@/vstutils/utils';
+import type { InstancesList, Model } from '#vstutils/models';
+import type { QuerySet } from '#vstutils/querySet';
+import type { RepresentData } from '#vstutils/utils';
 
 const pageSize = 20;
 
diff --git a/frontend_src/vstutils/fields/hidden.ts b/frontend_src/vstutils/fields/hidden.ts
index 5ca7c4f8..377157c5 100644
--- a/frontend_src/vstutils/fields/hidden.ts
+++ b/frontend_src/vstutils/fields/hidden.ts
@@ -1,7 +1,7 @@
 import { defineComponent, h } from 'vue';
-import { BaseField, FieldPropsDef } from '@/vstutils/fields/base';
+import { BaseField, FieldPropsDef } from '#vstutils/fields/base';
 
-import type { DefaultXOptions, FieldOptions, FieldPropsDefType } from '@/vstutils/fields/base';
+import type { DefaultXOptions, FieldOptions, FieldPropsDefType } from '#vstutils/fields/base';
 
 export const HiddenFieldMixin = defineComponent({
     props: FieldPropsDef as FieldPropsDefType<HiddenField>,
diff --git a/frontend_src/vstutils/fields/json/JSONField.ts b/frontend_src/vstutils/fields/json/JSONField.ts
index 56db8b1a..239bd4bd 100644
--- a/frontend_src/vstutils/fields/json/JSONField.ts
+++ b/frontend_src/vstutils/fields/json/JSONField.ts
@@ -1,10 +1,10 @@
 import { defineComponent } from 'vue';
 import JsonFieldContentReadonly from './JsonFieldContentReadonly.vue';
 import type { DefaultXOptions, FieldOptions, FieldPropsDefType } from '../base';
-import { BaseField, BaseFieldMixin, FieldPropsDef } from '@/vstutils/fields/base';
+import { BaseField, BaseFieldMixin, FieldPropsDef } from '#vstutils/fields/base';
 import JsonMapper from './JsonMapper.js';
-import type { InnerData } from '@/vstutils/utils';
-import TextAreaFieldContentEdit from '@/vstutils/fields/text/TextAreaFieldContentEdit.vue';
+import type { InnerData } from '#vstutils/utils';
+import TextAreaFieldContentEdit from '#vstutils/fields/text/TextAreaFieldContentEdit.vue';
 
 const JSONFieldComponent = defineComponent({
     components: {
diff --git a/frontend_src/vstutils/fields/nested-object/NestedObjectArrayFieldEdit.vue b/frontend_src/vstutils/fields/nested-object/NestedObjectArrayFieldEdit.vue
index 821a135a..6b6120f5 100644
--- a/frontend_src/vstutils/fields/nested-object/NestedObjectArrayFieldEdit.vue
+++ b/frontend_src/vstutils/fields/nested-object/NestedObjectArrayFieldEdit.vue
@@ -39,18 +39,18 @@
 
 <script setup lang="ts">
     import { computed, ref, set } from 'vue';
-    import Card from '@/vstutils/components/Card.vue';
-    import ModelFields from '@/vstutils/components/page/ModelFields.vue';
-    import { emptyRepresentData } from '@/vstutils/utils';
-    import type { NestedObjectField } from '@/vstutils/fields/nested-object/index';
-    import type ArrayField from '@/vstutils/fields/array/ArrayField';
-    import type { FieldEditPropsDefType } from '@/vstutils/fields/base';
+    import Card from '#vstutils/components/Card.vue';
+    import ModelFields from '#vstutils/components/page/ModelFields.vue';
+    import { emptyRepresentData } from '#vstutils/utils';
+    import type { NestedObjectField } from '#vstutils/fields/nested-object/index';
+    import type ArrayField from '#vstutils/fields/array/ArrayField';
+    import type { FieldEditPropsDefType } from '#vstutils/fields/base';
     import {
         FieldEditPropsDef,
         type ExtractRepresent,
         type SetFieldValueOptions,
-    } from '@/vstutils/fields/base';
-    import { HideButton } from '@/vstutils/fields/buttons';
+    } from '#vstutils/fields/base';
+    import { HideButton } from '#vstutils/fields/buttons';
 
     type Value = ExtractRepresent<ArrayField<NestedObjectField>>;
 
diff --git a/frontend_src/vstutils/fields/nested-object/array.ts b/frontend_src/vstutils/fields/nested-object/array.ts
index dc2bd0ba..3e8c37b4 100644
--- a/frontend_src/vstutils/fields/nested-object/array.ts
+++ b/frontend_src/vstutils/fields/nested-object/array.ts
@@ -1,5 +1,5 @@
 import { defineComponent } from 'vue';
-import { ArrayFieldMixin } from '@/vstutils/fields/array/mixins';
+import { ArrayFieldMixin } from '#vstutils/fields/array/mixins';
 import NestedObjectArrayFieldEdit from './NestedObjectArrayFieldEdit.vue';
 
 export const NestedObjectArrayFieldMixin = defineComponent({
diff --git a/frontend_src/vstutils/fields/nested-object/index.ts b/frontend_src/vstutils/fields/nested-object/index.ts
index bd6a1ff3..b28cff0a 100644
--- a/frontend_src/vstutils/fields/nested-object/index.ts
+++ b/frontend_src/vstutils/fields/nested-object/index.ts
@@ -1,6 +1,6 @@
 import { type Component, computed, defineComponent, h } from 'vue';
 
-import { ModelFields } from '@/vstutils/components/page';
+import { ModelFields } from '#vstutils/components/page';
 import type {
     Field,
     FieldOptions,
@@ -8,15 +8,15 @@ import type {
     FieldXOptions,
     ReplaceAdditionalPropertyKeyParams,
     SetFieldValueOptions,
-} from '@/vstutils/fields/base';
-import { BaseField, FieldPropsDef, useFieldWrapperClasses } from '@/vstutils/fields/base';
-import { onAppBeforeInit } from '@/vstutils/signals';
-import { emptyInnerData, emptyRepresentData, mapObjectValues } from '@/vstutils/utils';
+} from '#vstutils/fields/base';
+import { BaseField, FieldPropsDef, useFieldWrapperClasses } from '#vstutils/fields/base';
+import { onAppBeforeInit } from '#vstutils/signals';
+import { emptyInnerData, emptyRepresentData, mapObjectValues } from '#vstutils/utils';
 import { NestedObjectArrayFieldMixin } from './array';
 
-import type { ModelConstructor } from '@/vstutils/models';
-import type { InnerData, RepresentData } from '@/vstutils/utils';
-import type { ModelDefinition } from '@/vstutils/schema';
+import type { ModelConstructor } from '#vstutils/models';
+import type { InnerData, RepresentData } from '#vstutils/utils';
+import type { ModelDefinition } from '#vstutils/schema';
 
 type TInner = InnerData;
 type TRepresent = RepresentData;
diff --git a/frontend_src/vstutils/fields/numbers/array.ts b/frontend_src/vstutils/fields/numbers/array.ts
index 4c9c7671..bf5f8db9 100644
--- a/frontend_src/vstutils/fields/numbers/array.ts
+++ b/frontend_src/vstutils/fields/numbers/array.ts
@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue';
 
-import { StringArrayFieldEdit, StringArrayFieldMixin } from '@/vstutils/fields/text/string-array';
+import { StringArrayFieldEdit, StringArrayFieldMixin } from '#vstutils/fields/text/string-array';
 
 function validateNumber(text: string) {
     const number = Number.parseFloat(text.trim());
diff --git a/frontend_src/vstutils/fields/related-list/index.ts b/frontend_src/vstutils/fields/related-list/index.ts
index 5df19542..9950b8c5 100644
--- a/frontend_src/vstutils/fields/related-list/index.ts
+++ b/frontend_src/vstutils/fields/related-list/index.ts
@@ -1,12 +1,12 @@
-import { BaseField, BaseFieldMixin } from '@/vstutils/fields/base';
-import { onSchemaModelsCreated } from '@/vstutils/signals';
+import { BaseField, BaseFieldMixin } from '#vstutils/fields/base';
+import { onSchemaModelsCreated } from '#vstutils/signals';
 import RelatedListFieldListView from './RelatedListFieldListView.vue';
 import RelatedListFieldReadonlyView from './RelatedListFieldReadonlyView.vue';
 
-import type { FieldOptions, FieldXOptions } from '@/vstutils/fields/base';
-import type { ModelDefinition } from '@/vstutils/schema';
-import type { ModelConstructor } from '@/vstutils/models';
-import type { InnerData } from '@/vstutils/utils';
+import type { FieldOptions, FieldXOptions } from '#vstutils/fields/base';
+import type { ModelDefinition } from '#vstutils/schema';
+import type { ModelConstructor } from '#vstutils/models';
+import type { InnerData } from '#vstutils/utils';
 
 export const RelatedListFieldMixin = {
     components: {
diff --git a/frontend_src/vstutils/fields/static-value.ts b/frontend_src/vstutils/fields/static-value.ts
index 7acbfc2e..3070754e 100644
--- a/frontend_src/vstutils/fields/static-value.ts
+++ b/frontend_src/vstutils/fields/static-value.ts
@@ -1,7 +1,7 @@
 import { computed, h } from 'vue';
 
-import { BaseField, defineFieldComponent } from '@/vstutils/fields/base';
-import { onAppBeforeInit } from '@/vstutils/signals';
+import { BaseField, defineFieldComponent } from '#vstutils/fields/base';
+import { onAppBeforeInit } from '#vstutils/signals';
 
 import type {
     ExtractInner,
@@ -9,7 +9,7 @@ import type {
     Field,
     FieldOptions,
     FieldXOptions,
-} from '@/vstutils/fields/base';
+} from '#vstutils/fields/base';
 import type { FieldDefinition } from './FieldsResolver';
 import type { InnerData } from '../utils';
 
diff --git a/frontend_src/vstutils/fields/text/FieldTextarea.vue b/frontend_src/vstutils/fields/text/FieldTextarea.vue
index f5ea189a..638046a0 100644
--- a/frontend_src/vstutils/fields/text/FieldTextarea.vue
+++ b/frontend_src/vstutils/fields/text/FieldTextarea.vue
@@ -14,8 +14,8 @@
 
 <script setup lang="ts">
     import { toRef } from 'vue';
-    import type { Field } from '@/vstutils/fields/base';
-    import { useTextAreaAttrs } from '@/vstutils/fields/base';
+    import type { Field } from '#vstutils/fields/base';
+    import { useTextAreaAttrs } from '#vstutils/fields/base';
 
     const props = withDefaults(
         defineProps<{
diff --git a/frontend_src/vstutils/fields/text/HTMLFieldContentReadonly.vue b/frontend_src/vstutils/fields/text/HTMLFieldContentReadonly.vue
index ce75d20f..1413cee6 100644
--- a/frontend_src/vstutils/fields/text/HTMLFieldContentReadonly.vue
+++ b/frontend_src/vstutils/fields/text/HTMLFieldContentReadonly.vue
@@ -4,7 +4,7 @@
 </template>
 
 <script lang="ts">
-    import { FieldReadonlyPropsDef, type FieldReadonlyPropsDefType } from '@/vstutils/fields/base';
+    import { FieldReadonlyPropsDef, type FieldReadonlyPropsDefType } from '#vstutils/fields/base';
     import type { HTMLField } from './HTMLField';
 
     export default {
diff --git a/frontend_src/vstutils/fields/text/StringArrayFieldListView.vue b/frontend_src/vstutils/fields/text/StringArrayFieldListView.vue
index a2fe9e22..88955fd5 100644
--- a/frontend_src/vstutils/fields/text/StringArrayFieldListView.vue
+++ b/frontend_src/vstutils/fields/text/StringArrayFieldListView.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts">
-    import { BaseFieldListView } from '@/vstutils/fields/base';
+    import { BaseFieldListView } from '#vstutils/fields/base';
 
     export default {
         mixins: [BaseFieldListView],
diff --git a/frontend_src/vstutils/fields/text/TextAreaField.ts b/frontend_src/vstutils/fields/text/TextAreaField.ts
index 88b86723..e88cc404 100644
--- a/frontend_src/vstutils/fields/text/TextAreaField.ts
+++ b/frontend_src/vstutils/fields/text/TextAreaField.ts
@@ -1,11 +1,11 @@
 import { defineComponent } from 'vue';
 
-import { BaseField, BaseFieldMixin } from '@/vstutils/fields/base';
+import { BaseField, BaseFieldMixin } from '#vstutils/fields/base';
 
 import TextAreaFieldContentEdit from './TextAreaFieldContentEdit.vue';
 import TextAreaFieldContentReadonly from './TextAreaFieldContentReadonly.vue';
 
-import type { FieldMixin } from '@/vstutils/fields/base';
+import type { FieldMixin } from '#vstutils/fields/base';
 
 export const TextAreaFieldMixin = defineComponent({
     components: {
diff --git a/frontend_src/vstutils/fields/text/TextAreaFieldContentEdit.vue b/frontend_src/vstutils/fields/text/TextAreaFieldContentEdit.vue
index 0fac72c2..a978f6e6 100644
--- a/frontend_src/vstutils/fields/text/TextAreaFieldContentEdit.vue
+++ b/frontend_src/vstutils/fields/text/TextAreaFieldContentEdit.vue
@@ -12,8 +12,8 @@
         FieldEditEmitsDef,
         type FieldEditEmitsDefType,
         type FieldEditPropsDefType,
-    } from '@/vstutils/fields/base';
-    import FileInputButton from '@/vstutils/components/FileInputButton.vue';
+    } from '#vstutils/fields/base';
+    import FileInputButton from '#vstutils/components/FileInputButton.vue';
     import FieldTextarea from './FieldTextarea.vue';
     import type { TextAreaField } from './TextAreaField';
     import type { IFileField } from '../files/file/utils';
diff --git a/frontend_src/vstutils/fields/text/TextAreaFieldContentReadonly.vue b/frontend_src/vstutils/fields/text/TextAreaFieldContentReadonly.vue
index c2910e3e..f5746d28 100644
--- a/frontend_src/vstutils/fields/text/TextAreaFieldContentReadonly.vue
+++ b/frontend_src/vstutils/fields/text/TextAreaFieldContentReadonly.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script lang="ts">
-    import { BaseFieldContentReadonlyMixin } from '@/vstutils/fields/base';
+    import { BaseFieldContentReadonlyMixin } from '#vstutils/fields/base';
     export default {
         extends: BaseFieldContentReadonlyMixin,
     };
diff --git a/frontend_src/vstutils/fields/text/TextParagraphField.ts b/frontend_src/vstutils/fields/text/TextParagraphField.ts
index 19fe3bc1..ff1b6ed1 100644
--- a/frontend_src/vstutils/fields/text/TextParagraphField.ts
+++ b/frontend_src/vstutils/fields/text/TextParagraphField.ts
@@ -1,8 +1,8 @@
 import { defineComponent } from 'vue';
-import { BaseField } from '@/vstutils/fields/base';
+import { BaseField } from '#vstutils/fields/base';
 import TextParagraphFieldContentReadonly from './TextParagraphFieldContentReadonly.vue';
 import TextAreaFieldContentEdit from './TextAreaFieldContentEdit.vue';
-import type { InnerData } from '@/vstutils/utils';
+import type { InnerData } from '#vstutils/utils';
 
 const TextParagraphFieldMixin = defineComponent({
     components: {
diff --git a/frontend_src/vstutils/fields/text/TextParagraphFieldContentReadonly.vue b/frontend_src/vstutils/fields/text/TextParagraphFieldContentReadonly.vue
index b15177e5..ed306397 100644
--- a/frontend_src/vstutils/fields/text/TextParagraphFieldContentReadonly.vue
+++ b/frontend_src/vstutils/fields/text/TextParagraphFieldContentReadonly.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts">
-    import { BaseFieldContentReadonlyMixin } from '@/vstutils/fields/base';
+    import { BaseFieldContentReadonlyMixin } from '#vstutils/fields/base';
 
     export default {
         mixins: [BaseFieldContentReadonlyMixin],
diff --git a/frontend_src/vstutils/fields/text/URIField.ts b/frontend_src/vstutils/fields/text/URIField.ts
index 80f14f64..9e70f055 100644
--- a/frontend_src/vstutils/fields/text/URIField.ts
+++ b/frontend_src/vstutils/fields/text/URIField.ts
@@ -1,9 +1,9 @@
 import { h } from 'vue';
-import { defineFieldComponent } from '@/vstutils/fields/base';
-import { StringField } from '@/vstutils/fields/text';
-import { ValidationError } from '@/vstutils/fields/validation';
-import type { RepresentData } from '@/vstutils/utils';
-import type { FieldReadonlySetupFunction, FieldOptions, FieldXOptions } from '@/vstutils/fields/base';
+import { defineFieldComponent } from '#vstutils/fields/base';
+import { StringField } from '#vstutils/fields/text';
+import { ValidationError } from '#vstutils/fields/validation';
+import type { RepresentData } from '#vstutils/utils';
+import type { FieldReadonlySetupFunction, FieldOptions, FieldXOptions } from '#vstutils/fields/base';
 
 const createUrlValidator = (allowedSchemes: string[]) => {
     const error = new ValidationError('Invalid URL');
diff --git a/frontend_src/vstutils/fields/text/WYSIWYGField.ts b/frontend_src/vstutils/fields/text/WYSIWYGField.ts
index 4f303a75..96d41608 100644
--- a/frontend_src/vstutils/fields/text/WYSIWYGField.ts
+++ b/frontend_src/vstutils/fields/text/WYSIWYGField.ts
@@ -1,7 +1,7 @@
 import { h } from 'vue';
 
-import { WYSIWYGEditor } from '@/vstutils/components/wysiwyg-editor';
-import { defineFieldComponent } from '@/vstutils/fields/base';
+import { WYSIWYGEditor } from '#vstutils/components/wysiwyg-editor';
+import { defineFieldComponent } from '#vstutils/fields/base';
 
 import { TextAreaField } from './TextAreaField';
 
diff --git a/frontend_src/vstutils/fields/text/__tests__/phone-field.test.ts b/frontend_src/vstutils/fields/text/__tests__/phone-field.test.ts
index 476e597c..2bb572b8 100644
--- a/frontend_src/vstutils/fields/text/__tests__/phone-field.test.ts
+++ b/frontend_src/vstutils/fields/text/__tests__/phone-field.test.ts
@@ -1,4 +1,4 @@
-import { createApp, createSchema, mount } from '@/unittests';
+import { createApp, createSchema, mount } from '#unittests';
 
 describe('PhoneField', () => {
     test('country code selector is rendered', async () => {
diff --git a/frontend_src/vstutils/fields/text/index.ts b/frontend_src/vstutils/fields/text/index.ts
index 940c8b7c..fd9930ad 100644
--- a/frontend_src/vstutils/fields/text/index.ts
+++ b/frontend_src/vstutils/fields/text/index.ts
@@ -20,6 +20,9 @@ export * from './StringArrayField';
 export * from './HTMLField';
 export * from './TextParagraphField';
 
-export * as masked from './masked';
-export * as phone from './phone';
-export * as wysiwyg from './WYSIWYGField';
+import * as masked from './masked';
+export { masked };
+import * as phone from './phone';
+export { phone };
+import * as wysiwyg from './WYSIWYGField';
+export { wysiwyg };
diff --git a/frontend_src/vstutils/fields/text/string-array.ts b/frontend_src/vstutils/fields/text/string-array.ts
index f1c9ff12..34508fd7 100644
--- a/frontend_src/vstutils/fields/text/string-array.ts
+++ b/frontend_src/vstutils/fields/text/string-array.ts
@@ -1,13 +1,13 @@
 import type { PropType } from 'vue';
 import { defineComponent, h } from 'vue';
 
-import TagsSelector from '@/vstutils/components/TagsSelector.vue';
-import { HideButton } from '@/vstutils/fields/buttons';
-import { resumeEnterPropagation, stopEnterPropagation } from '@/vstutils/utils';
+import TagsSelector from '#vstutils/components/TagsSelector.vue';
+import { HideButton } from '#vstutils/fields/buttons';
+import { resumeEnterPropagation, stopEnterPropagation } from '#vstutils/utils';
 
-import { ArrayFieldMixin } from '@/vstutils/fields/array/mixins';
+import { ArrayFieldMixin } from '#vstutils/fields/array/mixins';
 
-import { type ArrayField } from '@/vstutils/fields/array/ArrayField';
+import { type ArrayField } from '#vstutils/fields/array/ArrayField';
 
 import './string-array.scss';
 
diff --git a/frontend_src/vstutils/fields/validation.js b/frontend_src/vstutils/fields/validation.js
index 4897e09f..3f6d6da6 100644
--- a/frontend_src/vstutils/fields/validation.js
+++ b/frontend_src/vstutils/fields/validation.js
@@ -3,7 +3,7 @@ export class ValidationError extends Error {}
 export class FieldValidator {
     /**
      * @param {*} value
-     * @param {RepresentData} data
+     * @param {import('../utils').RepresentData} data
      * @throws {ValidationError}
      */
     validate(value, data) {}
diff --git a/frontend_src/vstutils/init-app.ts b/frontend_src/vstutils/init-app.ts
index 25f990fb..2a0fd7a4 100644
--- a/frontend_src/vstutils/init-app.ts
+++ b/frontend_src/vstutils/init-app.ts
@@ -1,7 +1,7 @@
-import OpenAPILoader from '@/vstutils/OpenAPILoader';
-import { createApiFetch } from '@/vstutils/api-fetch';
-import { App } from '@/vstutils/app';
-import { signals } from '@/vstutils/signals';
+import OpenAPILoader from '#vstutils/OpenAPILoader';
+import { createApiFetch } from '#vstutils/api-fetch';
+import { App } from '#vstutils/app';
+import { signals } from '#vstutils/signals';
 import { type OidcStandardClaims, UserManager, WebStorageStateStore } from 'oidc-client-ts';
 import type Vue from 'vue';
 import { type AuthAppFactory } from './auth-app';
@@ -169,7 +169,7 @@ async function prepareConfig({ rawConfig }: InitAppContext): Promise<InitAppCont
 async function openAuthApp(ctx: InitAppContextWithConfig) {
     const config = ctx.config;
     const authAppFactory =
-        config.createAuthApp ?? (await import('@/vstutils/default-auth-app')).createDefaultAuthApp;
+        config.createAuthApp ?? (await import('#vstutils/default-auth-app')).createDefaultAuthApp;
     const child = createChildEl(config.el);
 
     const authApp = await authAppFactory({
diff --git a/frontend_src/vstutils/local-settings/scanner-camera.ts b/frontend_src/vstutils/local-settings/scanner-camera.ts
index 706a0d3d..b20ea015 100644
--- a/frontend_src/vstutils/local-settings/scanner-camera.ts
+++ b/frontend_src/vstutils/local-settings/scanner-camera.ts
@@ -1,5 +1,5 @@
-import { signals } from '@/vstutils/signals';
-import { CameraSelectField } from '@/vstutils/fields/camera-select';
+import { signals } from '#vstutils/signals';
+import { CameraSelectField } from '#vstutils/fields/camera-select';
 
 signals.once('models[_LocalSettings].fields.beforeInit', (fields) => {
     const scannerCameraField = new CameraSelectField({
diff --git a/frontend_src/vstutils/models/Model.ts b/frontend_src/vstutils/models/Model.ts
index 3be38a4d..10730f96 100644
--- a/frontend_src/vstutils/models/Model.ts
+++ b/frontend_src/vstutils/models/Model.ts
@@ -1,8 +1,8 @@
 import type { APIResponse } from '../api';
 import type { Field } from '../fields/base';
 import type { QuerySet } from '../querySet';
-import type { HttpMethod, InnerData, RepresentData } from '@/vstutils/utils';
-import type { MODEL_MODES } from '@/vstutils/schema';
+import type { HttpMethod, InnerData, RepresentData } from '#vstutils/utils';
+import type { MODEL_MODES } from '#vstutils/schema';
 import {
     deepEqual,
     escapeHtml,
@@ -10,7 +10,7 @@ import {
     mergeDeep,
     emptyInnerData,
     emptyRepresentData,
-} from '@/vstutils/utils';
+} from '#vstutils/utils';
 import { createModelSandbox, type ModelSandbox } from './sandbox';
 import { ModelValidationError } from './errors';
 import { getAdditionalPropertiesField, hasAdditionalProperties } from '../additionalProperties';
diff --git a/frontend_src/vstutils/models/ModelsResolver.ts b/frontend_src/vstutils/models/ModelsResolver.ts
index f0af1df8..e191ba9b 100644
--- a/frontend_src/vstutils/models/ModelsResolver.ts
+++ b/frontend_src/vstutils/models/ModelsResolver.ts
@@ -1,14 +1,14 @@
-import { signals } from '@/vstutils/signals';
-import type { Field } from '@/vstutils/fields/base';
-import { BaseField } from '@/vstutils/fields/base';
+import { signals } from '#vstutils/signals';
+import type { Field } from '#vstutils/fields/base';
+import { BaseField } from '#vstutils/fields/base';
 
 import type { ModelConstructor } from './Model';
 import { BaseModel } from './Model';
 import { makeModel } from './utils';
 
-import { MODEL_MODES } from '@/vstutils/schema';
-import type { AppSchema, ModelDefinition } from '@/vstutils/schema';
-import type { FieldsResolver } from '@/vstutils/fields';
+import { MODEL_MODES } from '#vstutils/schema';
+import type { AppSchema, ModelDefinition } from '#vstutils/schema';
+import type { FieldsResolver } from '#vstutils/fields';
 import AddKeyField from '../additionalProperties/AddKeyField.vue';
 import type { FieldDefinition } from '../fields/FieldsResolver';
 import { getUniqueId } from '../utils';
diff --git a/frontend_src/vstutils/models/__tests__/additionalProperties.test.ts b/frontend_src/vstutils/models/__tests__/additionalProperties.test.ts
index aa86c4aa..0871e19f 100644
--- a/frontend_src/vstutils/models/__tests__/additionalProperties.test.ts
+++ b/frontend_src/vstutils/models/__tests__/additionalProperties.test.ts
@@ -1,7 +1,7 @@
-import { createApp, createSchema, schemaListOf, waitForPageLoading, openPage } from '@/unittests';
-import type { getApp } from '@/vstutils/utils';
+import { createApp, createSchema, schemaListOf, waitForPageLoading, openPage } from '#unittests';
+import type { getApp } from '#vstutils/utils';
 import { ModelValidationError } from '..';
-import { emptyInnerData } from '@/vstutils/utils';
+import { emptyInnerData } from '#vstutils/utils';
 import { screen } from '@testing-library/dom';
 
 let app: Awaited<ReturnType<typeof getApp>>;
diff --git a/frontend_src/vstutils/models/__tests__/data-based-fields-visibility.test.ts b/frontend_src/vstutils/models/__tests__/data-based-fields-visibility.test.ts
index cd0f0ed3..70a704d2 100644
--- a/frontend_src/vstutils/models/__tests__/data-based-fields-visibility.test.ts
+++ b/frontend_src/vstutils/models/__tests__/data-based-fields-visibility.test.ts
@@ -1,4 +1,4 @@
-import { createApp, createSchema, schemaListOf, useTestCtx } from '@/unittests';
+import { createApp, createSchema, schemaListOf, useTestCtx } from '#unittests';
 
 const schema = createSchema({
     paths: {
diff --git a/frontend_src/vstutils/models/__tests__/errors.test.js b/frontend_src/vstutils/models/__tests__/errors.test.js
index aec4a4eb..f7346e58 100644
--- a/frontend_src/vstutils/models/__tests__/errors.test.js
+++ b/frontend_src/vstutils/models/__tests__/errors.test.js
@@ -1,4 +1,4 @@
-import { StringField } from '@/vstutils/fields/text';
+import { StringField } from '#vstutils/fields/text';
 import { ModelValidationError } from './../errors';
 
 describe('ModelValidationError', () => {
diff --git a/frontend_src/vstutils/models/__tests__/models-generation.test.ts b/frontend_src/vstutils/models/__tests__/models-generation.test.ts
index 68c21a1b..828173fe 100644
--- a/frontend_src/vstutils/models/__tests__/models-generation.test.ts
+++ b/frontend_src/vstutils/models/__tests__/models-generation.test.ts
@@ -1,5 +1,5 @@
-import { createApp, createSchema } from '@/unittests';
-import { getApp } from '@/vstutils/utils';
+import { createApp, createSchema } from '#unittests';
+import { getApp } from '#vstutils/utils';
 
 describe('Models generation', () => {
     beforeAll(async () => {
diff --git a/frontend_src/vstutils/models/__tests__/readonly-fields-validation.test.ts b/frontend_src/vstutils/models/__tests__/readonly-fields-validation.test.ts
index ece3c621..389bc73d 100644
--- a/frontend_src/vstutils/models/__tests__/readonly-fields-validation.test.ts
+++ b/frontend_src/vstutils/models/__tests__/readonly-fields-validation.test.ts
@@ -1,4 +1,4 @@
-import { createApp, createSchema, useTestCtx } from '@/unittests';
+import { createApp, createSchema, useTestCtx } from '#unittests';
 
 beforeAll(async () => {
     await createApp({
diff --git a/frontend_src/vstutils/models/errors.ts b/frontend_src/vstutils/models/errors.ts
index 91dfabb2..88e1b5a5 100644
--- a/frontend_src/vstutils/models/errors.ts
+++ b/frontend_src/vstutils/models/errors.ts
@@ -1,6 +1,6 @@
-import type { Field } from '@/vstutils/fields/base/BaseField';
-import { i18n } from '@/vstutils/translation';
-import { escapeHtml } from '@/vstutils/utils';
+import type { Field } from '#vstutils/fields/base/BaseField';
+import { i18n } from '#vstutils/translation';
+import { escapeHtml } from '#vstutils/utils';
 
 export interface FieldValidationErrorInfo {
     field: Field;
diff --git a/frontend_src/vstutils/models/index.ts b/frontend_src/vstutils/models/index.ts
index f6e6042b..c51c7fef 100644
--- a/frontend_src/vstutils/models/index.ts
+++ b/frontend_src/vstutils/models/index.ts
@@ -1,4 +1,4 @@
-import { StringField } from '@/vstutils/fields/text';
+import { StringField } from '#vstutils/fields/text';
 import { makeModel } from './utils';
 import { BaseModel } from './Model';
 import type { Model } from './Model';
diff --git a/frontend_src/vstutils/models/sandbox.ts b/frontend_src/vstutils/models/sandbox.ts
index d926b18b..4bd90e2a 100644
--- a/frontend_src/vstutils/models/sandbox.ts
+++ b/frontend_src/vstutils/models/sandbox.ts
@@ -1,11 +1,11 @@
 import Vue, { computed, customRef, markRaw, ref } from 'vue';
 
-import { emptyRepresentData } from '@/vstutils/utils';
-import { emptyInnerData } from '@/vstutils/utils';
+import { emptyRepresentData } from '#vstutils/utils';
+import { emptyInnerData } from '#vstutils/utils';
 import { ModelValidationError, type FieldValidationErrorInfo } from './errors';
 
-import type { RepresentData } from '@/vstutils/utils';
-import type { SetFieldValueOptions } from '@/vstutils/fields/base';
+import type { RepresentData } from '#vstutils/utils';
+import type { SetFieldValueOptions } from '#vstutils/fields/base';
 import type { Model, ModelConstructor } from './Model';
 import { getAdditionalPropertiesField, hasAdditionalProperties } from '../additionalProperties';
 
diff --git a/frontend_src/vstutils/models/utils.ts b/frontend_src/vstutils/models/utils.ts
index 3c7fc8c6..f0c80cc0 100644
--- a/frontend_src/vstutils/models/utils.ts
+++ b/frontend_src/vstutils/models/utils.ts
@@ -4,7 +4,7 @@ import type {
     Field,
     FieldConstructor,
     FieldOptions,
-} from '@/vstutils/fields/base';
+} from '#vstutils/fields/base';
 import type { BaseModel } from './Model';
 
 const pkFields = ['id', 'pk'];
diff --git a/frontend_src/vstutils/page-loader/index.js b/frontend_src/vstutils/page-loader/index.js
index 39f1653d..3b5d10e4 100644
--- a/frontend_src/vstutils/page-loader/index.js
+++ b/frontend_src/vstutils/page-loader/index.js
@@ -1,10 +1,10 @@
 import './style.css';
-import { cleanAllCacheAndReloadPage } from '@/vstutils/cleanCacheHelpers.js';
+import { cleanAllCacheAndReloadPage } from '#vstutils/cleanCacheHelpers.js';
 
 /**
  * Function creates DOM element and sets it attributes and props.
  * @param {string} type Type (tag) of DOM element.
- * @param {array} attributes Array of objects -
+ * @param {Array} attributes Array of objects -
  * DOM element attributes(key, value).
  * @param {object} props Object with properties of DOM element.
  */
diff --git a/frontend_src/vstutils/popUp/ErrorHandler.js b/frontend_src/vstutils/popUp/ErrorHandler.js
index d449a940..0b27b729 100644
--- a/frontend_src/vstutils/popUp/ErrorHandler.js
+++ b/frontend_src/vstutils/popUp/ErrorHandler.js
@@ -1,5 +1,5 @@
 import { guiPopUp } from './PopUp';
-import { ModelValidationError } from '@/vstutils/models/errors';
+import { ModelValidationError } from '#vstutils/models/errors';
 
 const SPECIAL_ERRORS_KEYS = ['non_field_errors', 'other_errors'];
 
diff --git a/frontend_src/vstutils/popUp/PopUp.js b/frontend_src/vstutils/popUp/PopUp.js
index 8487cd1e..fe751210 100644
--- a/frontend_src/vstutils/popUp/PopUp.js
+++ b/frontend_src/vstutils/popUp/PopUp.js
@@ -1,5 +1,5 @@
 import iziToast from 'izitoast';
-import { i18n } from '@/vstutils/translation';
+import { i18n } from '#vstutils/translation';
 
 /**
  * Class, that is responsible for showing of pop up notification.
@@ -113,9 +113,9 @@ export class PopUp {
      * Method, that generates question pop up.
      * Returns promise of getting user's answer.
      * @param {string} message Question text.
-     * @param {array} answer_buttons Array of strings - titles for answer buttons.
+     * @param {Array} answer_buttons Array of strings - titles for answer buttons.
      * @param {object} opt Object with custom settings for question pop up.
-     * @return {promise}.
+     * @return {Promise}.
      */
     question(message = '', answer_buttons = [], opt = {}) {
         let buttons = [];
diff --git a/frontend_src/vstutils/popUp/__tests__/ErrorHandler.test.js b/frontend_src/vstutils/popUp/__tests__/ErrorHandler.test.js
index b26665d1..36bdfa76 100644
--- a/frontend_src/vstutils/popUp/__tests__/ErrorHandler.test.js
+++ b/frontend_src/vstutils/popUp/__tests__/ErrorHandler.test.js
@@ -1,7 +1,7 @@
 import ErrorHandler from '../ErrorHandler.js';
 import { StringField } from '../../fields/text';
 import { guiPopUp } from '../PopUp';
-import { ModelValidationError } from '@/vstutils/models';
+import { ModelValidationError } from '#vstutils/models';
 
 vitest.mock('../PopUp');
 
diff --git a/frontend_src/vstutils/querySet/QuerySet.ts b/frontend_src/vstutils/querySet/QuerySet.ts
index 0241166a..a663506a 100644
--- a/frontend_src/vstutils/querySet/QuerySet.ts
+++ b/frontend_src/vstutils/querySet/QuerySet.ts
@@ -1,14 +1,14 @@
 import $ from 'jquery';
 import { readonly } from 'vue';
 
-import { apiConnector, APIResponse, StatusError } from '@/vstutils/api';
-import { createInstancesList } from '@/vstutils/models';
-import { BulkType, HttpMethods, makeQueryString, objectToFormData, RequestTypes } from '@/vstutils/utils';
-import { fetchInstances } from '@/vstutils/fetch-values';
-
-import type { RequestType, HttpMethod, InnerData, RepresentData } from '@/vstutils/utils';
-import type { InstancesList, Model, ModelConstructor } from '@/vstutils/models';
-import type { Field } from '@/vstutils/fields/base';
+import { apiConnector, APIResponse, StatusError } from '#vstutils/api';
+import { createInstancesList } from '#vstutils/models';
+import { BulkType, HttpMethods, makeQueryString, objectToFormData, RequestTypes } from '#vstutils/utils';
+import { fetchInstances } from '#vstutils/fetch-values';
+
+import type { RequestType, HttpMethod, InnerData, RepresentData } from '#vstutils/utils';
+import type { InstancesList, Model, ModelConstructor } from '#vstutils/models';
+import type { Field } from '#vstutils/fields/base';
 import type { ListResponseData } from './types';
 
 const REQUEST_MODEL = 0;
@@ -549,7 +549,7 @@ export class QuerySet {
     }
 }
 
-interface InternalRequest {
+export interface InternalRequest {
     method: HttpMethod;
     path: string | (string | number)[];
     query?: string | Record<string, unknown> | URLSearchParams;
diff --git a/frontend_src/vstutils/querySet/QuerySetsResolver.js b/frontend_src/vstutils/querySet/QuerySetsResolver.js
index c8369283..d547a179 100644
--- a/frontend_src/vstutils/querySet/QuerySetsResolver.js
+++ b/frontend_src/vstutils/querySet/QuerySetsResolver.js
@@ -5,7 +5,7 @@ import { pathToArray, RequestTypes, ViewTypes } from '../utils';
  */
 export class QuerySetsResolver {
     /**
-     * @param {ViewsTree} viewsTree
+     * @param {import('../views/ViewsTree').ViewsTree} viewsTree
      */
     constructor(viewsTree) {
         this.viewsTree = viewsTree;
diff --git a/frontend_src/vstutils/querySet/__tests__/QuerySet-prefetch.test.js b/frontend_src/vstutils/querySet/__tests__/QuerySet-prefetch.test.js
index dcd1cde0..684de892 100644
--- a/frontend_src/vstutils/querySet/__tests__/QuerySet-prefetch.test.js
+++ b/frontend_src/vstutils/querySet/__tests__/QuerySet-prefetch.test.js
@@ -1,5 +1,5 @@
-import { RequestTypes } from '@/vstutils/utils';
-import { createApp } from '@/unittests';
+import { RequestTypes } from '#vstutils/utils';
+import { createApp } from '#unittests';
 import { QuerySet } from '../QuerySet';
 
 describe('QuerySet prefetch', () => {
diff --git a/frontend_src/vstutils/querySet/__tests__/QuerySet.test.js b/frontend_src/vstutils/querySet/__tests__/QuerySet.test.js
index 89270646..b8b0a382 100644
--- a/frontend_src/vstutils/querySet/__tests__/QuerySet.test.js
+++ b/frontend_src/vstutils/querySet/__tests__/QuerySet.test.js
@@ -4,7 +4,7 @@ import { makeModel, BaseModel } from '../../models';
 import StringField from '../../fields/text/StringField';
 import { QuerySet } from '../QuerySet';
 import { HttpMethods, RequestTypes } from '../../utils';
-import { createApp, createSchema, expectNthRequest } from '@/unittests';
+import { createApp, createSchema, expectNthRequest } from '#unittests';
 
 describe('QuerySet', () => {
     const idField = new IntegerField({ name: 'id', readOnly: true });
diff --git a/frontend_src/vstutils/querySet/__tests__/entity-update-race.test.ts b/frontend_src/vstutils/querySet/__tests__/entity-update-race.test.ts
index 76b46969..1c5b0ae2 100644
--- a/frontend_src/vstutils/querySet/__tests__/entity-update-race.test.ts
+++ b/frontend_src/vstutils/querySet/__tests__/entity-update-race.test.ts
@@ -1,8 +1,8 @@
-import { createApp, createSchema, expectRequest, fetchMockCallAt, waitForPageLoading } from '@/unittests';
+import { createApp, createSchema, expectRequest, fetchMockCallAt, waitForPageLoading } from '#unittests';
 import { screen, fireEvent, waitFor } from '@testing-library/dom';
-import { getApp } from '@/vstutils/utils';
-import { useViewStore } from '@/vstutils/store';
-import type { PageEditView } from '@/vstutils/views';
+import { getApp } from '#vstutils/utils';
+import { useViewStore } from '#vstutils/store';
+import type { PageEditView } from '#vstutils/views';
 
 beforeAll(async () => {
     await createApp({ schema: createSchema() });
diff --git a/frontend_src/vstutils/querySet/__tests__/fetch-values.test.js b/frontend_src/vstutils/querySet/__tests__/fetch-values.test.js
index 5f5d2e86..4cb5ff1c 100644
--- a/frontend_src/vstutils/querySet/__tests__/fetch-values.test.js
+++ b/frontend_src/vstutils/querySet/__tests__/fetch-values.test.js
@@ -1,7 +1,7 @@
 import { waitFor } from '@testing-library/dom';
-import { createApp, expectNthRequest } from '@/unittests';
-import { fetchInstances } from '@/vstutils/fetch-values';
-import { ArrayField } from '@/vstutils/fields/array';
+import { createApp, expectNthRequest } from '#unittests';
+import { fetchInstances } from '#vstutils/fetch-values';
+import { ArrayField } from '#vstutils/fields/array';
 
 let app;
 let User;
diff --git a/frontend_src/vstutils/router/RouterConstructor.ts b/frontend_src/vstutils/router/RouterConstructor.ts
index ce3ec95d..a3224dbb 100644
--- a/frontend_src/vstutils/router/RouterConstructor.ts
+++ b/frontend_src/vstutils/router/RouterConstructor.ts
@@ -1,8 +1,8 @@
 import VueRouter from 'vue-router';
-import { signals, ROUTES_CREATED } from '@/vstutils/signals';
+import { signals, ROUTES_CREATED } from '#vstutils/signals';
 
 import type { RouteConfig } from 'vue-router';
-import type { IView } from '@/vstutils/views';
+import type { IView } from '#vstutils/views';
 
 export default class RouterConstructor {
     private views: Map<string, IView>;
diff --git a/frontend_src/vstutils/router/customPages/NotFound.vue b/frontend_src/vstutils/router/customPages/NotFound.vue
index 2d543994..6344c0a3 100644
--- a/frontend_src/vstutils/router/customPages/NotFound.vue
+++ b/frontend_src/vstutils/router/customPages/NotFound.vue
@@ -4,7 +4,7 @@
     </div>
 </template>
 <script>
-    import { BaseViewMixin, ErrorPage } from '@/vstutils/components';
+    import { BaseViewMixin, ErrorPage } from '#vstutils/components';
 
     export default {
         components: { ErrorPage },
diff --git a/frontend_src/vstutils/signals.ts b/frontend_src/vstutils/signals.ts
index 6eb7f510..64b8f5bf 100644
--- a/frontend_src/vstutils/signals.ts
+++ b/frontend_src/vstutils/signals.ts
@@ -1,12 +1,12 @@
 import { onScopeDispose } from 'vue';
 import TabSignal from '@vstconsulting/tabsignal';
 
-import { capitalize, getApp } from '@/vstutils/utils';
+import { capitalize, getApp } from '#vstutils/utils';
 
-import type { Model } from '@/vstutils/models';
-import type { IAppInitialized } from '@/vstutils/app';
-import type { RepresentData } from '@/vstutils/utils';
-import type { Action, Sublink } from '@/vstutils/views';
+import type { Model } from '#vstutils/models';
+import type { IAppInitialized } from '#vstutils/app';
+import type { RepresentData } from '#vstutils/utils';
+import type { Action, Sublink } from '#vstutils/views';
 import type { RouteConfig } from 'vue-router';
 import type { AppSchema } from './schema';
 
diff --git a/frontend_src/vstutils/store/__tests__/actionViewStore.test.js b/frontend_src/vstutils/store/__tests__/actionViewStore.test.js
index 3648ed77..fd32dc9d 100644
--- a/frontend_src/vstutils/store/__tests__/actionViewStore.test.js
+++ b/frontend_src/vstutils/store/__tests__/actionViewStore.test.js
@@ -1,4 +1,4 @@
-import { createApp, createSchema, expectNthRequest, waitForPageLoading } from '@/unittests';
+import { createApp, createSchema, expectNthRequest, waitForPageLoading } from '#unittests';
 import detailPageSchema from './detailPage-schema.json';
 import { ActionView } from '../../views';
 
diff --git a/frontend_src/vstutils/store/__tests__/custom-title.test.js b/frontend_src/vstutils/store/__tests__/custom-title.test.js
index 331538d5..f1f3ae24 100644
--- a/frontend_src/vstutils/store/__tests__/custom-title.test.js
+++ b/frontend_src/vstutils/store/__tests__/custom-title.test.js
@@ -1,5 +1,5 @@
 import { waitFor } from '@testing-library/dom';
-import { createApp, createSchema } from '@/unittests';
+import { createApp, createSchema } from '#unittests';
 import detailPageSchema from './detailPage-schema.json';
 
 test('title customization using View.getTitle', async () => {
diff --git a/frontend_src/vstutils/store/__tests__/deep-nested.test.js b/frontend_src/vstutils/store/__tests__/deep-nested.test.js
index 41b09d39..f5cd1a12 100644
--- a/frontend_src/vstutils/store/__tests__/deep-nested.test.js
+++ b/frontend_src/vstutils/store/__tests__/deep-nested.test.js
@@ -1,4 +1,4 @@
-import { createApp, createSchema } from '@/unittests';
+import { createApp, createSchema } from '#unittests';
 import deepNestedSchema from './deep-nested-schema.json';
 import { waitFor } from '@testing-library/dom';
 
diff --git a/frontend_src/vstutils/store/__tests__/detailPage.test.js b/frontend_src/vstutils/store/__tests__/detailPage.test.js
index 79d6e370..1eed149a 100644
--- a/frontend_src/vstutils/store/__tests__/detailPage.test.js
+++ b/frontend_src/vstutils/store/__tests__/detailPage.test.js
@@ -6,7 +6,7 @@ import {
     fetchMockCallAt,
     waitFor,
     waitForPageLoading,
-} from '@/unittests';
+} from '#unittests';
 import detailPageSchema from './detailPage-schema.json';
 import putDetailPageSchema from './putDetailPage-schema.json';
 
diff --git a/frontend_src/vstutils/store/__tests__/detailPageFilters.test.js b/frontend_src/vstutils/store/__tests__/detailPageFilters.test.js
index ea4d2992..137bb405 100644
--- a/frontend_src/vstutils/store/__tests__/detailPageFilters.test.js
+++ b/frontend_src/vstutils/store/__tests__/detailPageFilters.test.js
@@ -1,4 +1,4 @@
-import { waitForPageLoading, createApp, createSchema } from '@/unittests';
+import { waitForPageLoading, createApp, createSchema } from '#unittests';
 import schema from './detailPageFilters-schema.json';
 
 beforeEach(() => {
diff --git a/frontend_src/vstutils/store/__tests__/localSettings.test.js b/frontend_src/vstutils/store/__tests__/localSettings.test.js
index 235a231b..df765993 100644
--- a/frontend_src/vstutils/store/__tests__/localSettings.test.js
+++ b/frontend_src/vstutils/store/__tests__/localSettings.test.js
@@ -1,6 +1,6 @@
-import { makeModel, BaseModel } from '@/vstutils/models';
-import { StringField } from '@/vstutils/fields/text';
-import { IntegerField } from '@/vstutils/fields/numbers/integer';
+import { makeModel, BaseModel } from '#vstutils/models';
+import { StringField } from '#vstutils/fields/text';
+import { IntegerField } from '#vstutils/fields/numbers/integer';
 import { createPinia } from 'pinia';
 import { createLocalSettingsStore } from './../localSettingsStore.ts';
 
diff --git a/frontend_src/vstutils/store/__tests__/modules.test.js b/frontend_src/vstutils/store/__tests__/modules.test.js
index 19584ea3..500423ac 100644
--- a/frontend_src/vstutils/store/__tests__/modules.test.js
+++ b/frontend_src/vstutils/store/__tests__/modules.test.js
@@ -1,4 +1,4 @@
-import { createApp, createSchema, openPage } from '@/unittests';
+import { createApp, createSchema, openPage } from '#unittests';
 
 describe('List store module', () => {
     let app;
diff --git a/frontend_src/vstutils/store/__tests__/page.test.js b/frontend_src/vstutils/store/__tests__/page.test.js
index 98c101b8..d5890dec 100644
--- a/frontend_src/vstutils/store/__tests__/page.test.js
+++ b/frontend_src/vstutils/store/__tests__/page.test.js
@@ -1,6 +1,6 @@
 import { ref } from 'vue';
 import { waitFor } from '@testing-library/dom';
-import { expectNthRequest, createApp, createSchema } from '@/unittests';
+import { expectNthRequest, createApp, createSchema } from '#unittests';
 import { useSelection } from '../helpers';
 import pageSchema from './page-schema.json';
 
diff --git a/frontend_src/vstutils/store/__tests__/prefetch-with-provided-instance.test.js b/frontend_src/vstutils/store/__tests__/prefetch-with-provided-instance.test.js
index cbdc7eb9..eb8648ba 100644
--- a/frontend_src/vstutils/store/__tests__/prefetch-with-provided-instance.test.js
+++ b/frontend_src/vstutils/store/__tests__/prefetch-with-provided-instance.test.js
@@ -1,5 +1,5 @@
-import { createApp } from '@/unittests/create-app';
-import { createSchema, expectRequest, fetchMockCallAt, waitFor } from '@/unittests';
+import { createApp } from '#unittests/create-app';
+import { createSchema, expectRequest, fetchMockCallAt, waitFor } from '#unittests';
 import schema from './prefetch-with-provided-instance-schema.json';
 
 test('prefetch with provided instance', async () => {
diff --git a/frontend_src/vstutils/store/__tests__/useParentViews.test.js b/frontend_src/vstutils/store/__tests__/useParentViews.test.js
index aa21a038..5b76912e 100644
--- a/frontend_src/vstutils/store/__tests__/useParentViews.test.js
+++ b/frontend_src/vstutils/store/__tests__/useParentViews.test.js
@@ -1,5 +1,5 @@
-import { createApp } from '@/unittests/create-app';
-import { createSchema } from '@/unittests/schema';
+import { createApp } from '#unittests/create-app';
+import { createSchema } from '#unittests/schema';
 import { useParentViews } from '../helpers';
 
 let app;
diff --git a/frontend_src/vstutils/store/globalStore.ts b/frontend_src/vstutils/store/globalStore.ts
index 6f9db6c2..69db0a37 100644
--- a/frontend_src/vstutils/store/globalStore.ts
+++ b/frontend_src/vstutils/store/globalStore.ts
@@ -1,7 +1,7 @@
 import { computed, ref, watch } from 'vue';
 import { useParentViews } from './helpers';
 
-import type { StoreInstance } from '@/vstutils/utils';
+import type { StoreInstance } from '#vstutils/utils';
 import type { BaseViewStore } from './page-types';
 
 export const GLOBAL_STORE = () => {
diff --git a/frontend_src/vstutils/store/helpers.ts b/frontend_src/vstutils/store/helpers.ts
index 8863fa18..866235af 100644
--- a/frontend_src/vstutils/store/helpers.ts
+++ b/frontend_src/vstutils/store/helpers.ts
@@ -15,11 +15,11 @@ import {
     watch,
 } from 'vue';
 
-import { useAutoUpdate } from '@/vstutils/autoupdate';
-import { useBreadcrumbs } from '@/vstutils/breadcrumbs';
-import { ModelValidationError } from '@/vstutils/models';
-import { filterOperations, signals } from '@/vstutils/signals';
-import { i18n } from '@/vstutils/translation';
+import { useAutoUpdate } from '#vstutils/autoupdate';
+import { useBreadcrumbs } from '#vstutils/breadcrumbs';
+import { ModelValidationError } from '#vstutils/models';
+import { filterOperations, signals } from '#vstutils/signals';
+import { i18n } from '#vstutils/translation';
 import { useRoute } from 'vue-router/composables';
 import {
     getApp,
@@ -33,15 +33,15 @@ import {
     emptyRepresentData,
     emptyInnerData,
     classesFromFields,
-} from '@/vstutils/utils';
+} from '#vstutils/utils';
 
 import type { Ref } from 'vue';
 import type { NavigationGuard, Route } from 'vue-router';
-import type { QuerySet } from '@/vstutils/querySet';
-import type { IView, ActionView, NotEmptyAction, ViewStore, DetailView } from '@/vstutils/views';
-import type { Model, ModelConstructor } from '@/vstutils/models';
-import type { IApp } from '@/vstutils/app';
-import type { RepresentData, InnerData } from '@/vstutils/utils';
+import type { QuerySet } from '#vstutils/querySet';
+import type { IView, ActionView, NotEmptyAction, ViewStore, DetailView } from '#vstutils/views';
+import type { Model, ModelConstructor } from '#vstutils/models';
+import type { IApp } from '#vstutils/app';
+import type { RepresentData, InnerData } from '#vstutils/utils';
 import type { BaseViewStore } from './page-types';
 import type { SetFieldValueOptions } from '../fields/base';
 
diff --git a/frontend_src/vstutils/store/localSettingsStore.ts b/frontend_src/vstutils/store/localSettingsStore.ts
index ecaa1954..1d7018c4 100644
--- a/frontend_src/vstutils/store/localSettingsStore.ts
+++ b/frontend_src/vstutils/store/localSettingsStore.ts
@@ -1,8 +1,8 @@
 import { computed, ref } from 'vue';
 import { defineStore } from 'pinia';
-import type { Model, ModelConstructor } from '@/vstutils/models';
-import type { SetFieldValueOptions } from '@/vstutils/fields/base';
-import type { InnerData } from '@/vstutils/utils';
+import type { Model, ModelConstructor } from '#vstutils/models';
+import type { SetFieldValueOptions } from '#vstutils/fields/base';
+import type { InnerData } from '#vstutils/utils';
 
 type Settings = Record<string, unknown>;
 
diff --git a/frontend_src/vstutils/store/page-types.ts b/frontend_src/vstutils/store/page-types.ts
index 3c6594d9..2df7e60a 100644
--- a/frontend_src/vstutils/store/page-types.ts
+++ b/frontend_src/vstutils/store/page-types.ts
@@ -1,10 +1,10 @@
 import type { Route } from 'vue-router';
 import type { StoreGeneric } from 'pinia';
-import type { Action, IView, Sublink } from '@/vstutils/views';
-import type { Breadcrumb } from '@/vstutils/breadcrumbs';
-import type { InnerData, RepresentData } from '@/vstutils/utils';
-import type { FieldsGroup, InstancesList, Model, ModelConstructor } from '@/vstutils/models';
-import type { SetFieldValueOptions } from '@/vstutils/fields/base';
+import type { Action, IView, Sublink } from '#vstutils/views';
+import type { Breadcrumb } from '#vstutils/breadcrumbs';
+import type { InnerData, RepresentData } from '#vstutils/utils';
+import type { FieldsGroup, InstancesList, Model, ModelConstructor } from '#vstutils/models';
+import type { SetFieldValueOptions } from '#vstutils/fields/base';
 import type { PaginationItem } from './helpers';
 
 export interface BaseViewStore extends StoreGeneric {
diff --git a/frontend_src/vstutils/store/page.ts b/frontend_src/vstutils/store/page.ts
index 625e4d4d..2526fa70 100644
--- a/frontend_src/vstutils/store/page.ts
+++ b/frontend_src/vstutils/store/page.ts
@@ -1,11 +1,11 @@
 import { computed, ref } from 'vue';
 
-import { createInstancesList, ModelValidationError } from '@/vstutils/models';
-import { guiPopUp, pop_up_msg } from '@/vstutils/popUp';
-import { i18n } from '@/vstutils/translation';
-import { emptyInnerData } from '@/vstutils/utils';
-import { getApp, isInstancesEqual, openPage, RequestTypes } from '@/vstutils/utils';
-import { fetchInstances } from '@/vstutils/fetch-values';
+import { createInstancesList, ModelValidationError } from '#vstutils/models';
+import { guiPopUp, pop_up_msg } from '#vstutils/popUp';
+import { i18n } from '#vstutils/translation';
+import { emptyInnerData } from '#vstutils/utils';
+import { getApp, isInstancesEqual, openPage, RequestTypes } from '#vstutils/utils';
+import { fetchInstances } from '#vstutils/fetch-values';
 import {
     createActionStore,
     filterNonEmpty,
@@ -24,10 +24,11 @@ import {
 } from './helpers';
 
 import type { Route } from 'vue-router';
-import type { InnerData, RepresentData } from '@/vstutils/utils';
-import type { Model, InstancesList } from '@/vstutils/models';
-import type { PageEditView, PageNewView, PageView, ActionView, Action, ListView } from '@/vstutils/views';
+import type { InnerData, RepresentData } from '#vstutils/utils';
+import type { Model, InstancesList } from '#vstutils/models';
+import type { PageEditView, PageNewView, PageView, ActionView, Action, ListView } from '#vstutils/views';
 import type { PageViewStore } from './page-types';
+export { innerDataMarker, representDataMarker } from './../utils/index';
 
 const createRemoveInstance =
     ({ pageView, unselect }: { pageView?: PageView | null; unselect?: (id: string | number) => void }) =>
@@ -182,7 +183,7 @@ export const createListViewStore = (view: ListView) => {
             guiPopUp.success(i18n.t(pop_up_msg.instance.success.removeMany) as string);
         } catch (error) {
             const str = app.error_handler.errorToString(error) as string;
-            const strToShow = i18n.t(pop_up_msg.instance.error.removeMany, [str]) as string;
+            const strToShow = i18n.ts(pop_up_msg.instance.error.removeMany, [str]) as string;
             app.error_handler.showError(strToShow, str);
         }
         selection.unselectIds(removedInstancesIds);
diff --git a/frontend_src/vstutils/store/userSettingsStore.ts b/frontend_src/vstutils/store/userSettingsStore.ts
index df17b357..c0892da7 100644
--- a/frontend_src/vstutils/store/userSettingsStore.ts
+++ b/frontend_src/vstutils/store/userSettingsStore.ts
@@ -1,11 +1,11 @@
 import { defineStore } from 'pinia';
-import { signals } from '@/vstutils/signals';
-import { HttpMethods } from '@/vstutils/utils';
+import { signals } from '#vstutils/signals';
+import { HttpMethods } from '#vstutils/utils';
 
-import type { ApiConnector } from '@/vstutils/api';
-import type { ModelConstructor } from '@/vstutils/models';
-import type { InnerData } from '@/vstutils/utils';
-import type { SetFieldValueOptions } from '@/vstutils/fields/base';
+import type { ApiConnector } from '#vstutils/api';
+import type { ModelConstructor } from '#vstutils/models';
+import type { InnerData } from '#vstutils/utils';
+import type { SetFieldValueOptions } from '#vstutils/fields/base';
 import { computed, readonly, ref } from 'vue';
 
 type Section = Record<string, unknown>;
diff --git a/frontend_src/vstutils/translation.ts b/frontend_src/vstutils/translation.ts
index bbd674ec..ac3ee11e 100644
--- a/frontend_src/vstutils/translation.ts
+++ b/frontend_src/vstutils/translation.ts
@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import VueI18n from 'vue-i18n';
+import VueI18n, { type Values, type Path } from 'vue-i18n';
 import '../libs/vue.js';
 import { getCookie, capitalize } from './utils';
 
@@ -24,45 +24,40 @@ export const RUPluralizationRule = (choice: number, choicesLength: number) => {
     return choicesLength < 4 ? 2 : 3;
 };
 
-declare module 'vue-i18n' {
-    export default class VueI18n {
-        /**
-         * If translation doesn't exist, checks if translation for lowercased text exists and returns it capitalized,
-         * also null and undefined are converted to empty string
-         */
-        st(text: string | null | undefined): string;
-        /**
-         * Works the same as `t` but always converts result to string
-         */
-        ts(key: VueI18n.Path, values?: VueI18n.Values): string;
-    }
-}
+export class CustomVueI18n extends VueI18n {
+    /**
+     * If translation doesn't exist, checks if translation for lowercased text exists and returns it capitalized,
+     * also null and undefined are converted to empty string
+     */
+    st(text: string | null | undefined): string {
+        if (text === undefined || text === null) {
+            return '';
+        }
 
-VueI18n.prototype.st = function st(text: string | null | undefined): string {
-    if (text === undefined || text === null) {
-        return '';
-    }
+        text = String(text);
 
-    text = String(text);
+        if (this.te(text)) {
+            return this.t(text) as string;
+        }
 
-    if (this.te(text)) {
-        return this.t(text) as string;
-    }
+        const lower = text.toLowerCase();
+        if (this.te(lower)) {
+            return capitalize(this.t(lower) as string);
+        }
 
-    const lower = text.toLowerCase();
-    if (this.te(lower)) {
-        return capitalize(this.t(lower) as string);
+        return text;
     }
 
-    return text;
-};
-
-VueI18n.prototype.ts = function ts(key: VueI18n.Path, values?: VueI18n.Values): string {
-    return String(this.t(key, values));
-};
+    /**
+     * Works the same as `t` but always converts result to string
+     */
+    ts(key: Path, values?: Values): string {
+        return String(this.t(key, values));
+    }
+}
 
 export function createVueI18n() {
-    return new VueI18n({
+    return new CustomVueI18n({
         locale: document.documentElement.lang || getCookie('lang') || 'en',
         messages: {},
         silentTranslationWarn: true,
diff --git a/frontend_src/vstutils/users/Gravatar.ts b/frontend_src/vstutils/users/Gravatar.ts
index 1a161d10..24d746c5 100644
--- a/frontend_src/vstutils/users/Gravatar.ts
+++ b/frontend_src/vstutils/users/Gravatar.ts
@@ -1,6 +1,6 @@
 // @ts-expect-error md5 has no types
 import md5 from 'md5';
-import { getApp } from '@/vstutils/utils';
+import { getApp } from '#vstutils/utils';
 import { type ReadonlyRefOrGetter, toValue } from '@vueuse/core';
 import { computed, ref } from 'vue';
 
diff --git a/frontend_src/vstutils/users/TFAPage.vue b/frontend_src/vstutils/users/TFAPage.vue
index 190ec68f..9a0e3536 100644
--- a/frontend_src/vstutils/users/TFAPage.vue
+++ b/frontend_src/vstutils/users/TFAPage.vue
@@ -4,8 +4,11 @@
     </p>
     <div v-else>
         <p>
-            <!-- eslint-disable-next-line prettier/prettier -->
-            {{ $t('Scan the image with the two-factor authentication app on your phone. If you can’t use a QR code, enter this text code instead.') }}
+            {{
+                $t(
+                    'Scan the image with the two-factor authentication app on your phone. If you can’t use a QR code, enter this text code instead.',
+                )
+            }}
         </p>
         <div class="qr-code-container">
             <img :src="qrcode" />
@@ -25,8 +28,11 @@
         />
         <hr />
         <p>
-            <!-- eslint-disable-next-line prettier/prettier -->
-            {{ $t('Recovery codes are used to access your account in the event you cannot receive two-factor authentication codes.') }}
+            {{
+                $t(
+                    'Recovery codes are used to access your account in the event you cannot receive two-factor authentication codes.',
+                )
+            }}
         </p>
         <div class="card recovery-codes">
             <div class="card-header">
@@ -49,10 +55,10 @@
 <script lang="ts" setup>
     import QRCode from 'qrcode';
     import { computed, ref, watch } from 'vue';
-    import { useViewStore } from '@/vstutils/store';
-    import { copyToClipboard } from '@/vstutils/utils';
+    import { useViewStore } from '#vstutils/store';
+    import { copyToClipboard } from '#vstutils/utils';
 
-    import type { PageEditView } from '@/vstutils/views';
+    import type { PageEditView } from '#vstutils/views';
 
     const store = useViewStore<PageEditView>();
 
diff --git a/frontend_src/vstutils/users/index.js b/frontend_src/vstutils/users/index.js
index 97388274..c9ccad7e 100644
--- a/frontend_src/vstutils/users/index.js
+++ b/frontend_src/vstutils/users/index.js
@@ -1,11 +1,11 @@
 import { computed } from 'vue';
-import { signals } from '@/vstutils/signals';
+import { signals } from '#vstutils/signals';
 import Gravatar from './Gravatar.ts';
 import TFAPage from './TFAPage.vue';
 import { IntegerField } from '../fields/numbers/integer.js';
 import { guiPopUp, pop_up_msg } from '../popUp';
 import { generatePassword, getApp, generateBase32String, generateRandomString } from '../utils';
-import { useViewStore } from '@/vstutils/store';
+import { useViewStore } from '#vstutils/store';
 import './settings.js';
 export { Gravatar };
 
diff --git a/frontend_src/vstutils/users/settings.js b/frontend_src/vstutils/users/settings.js
index 1835645b..794987d4 100644
--- a/frontend_src/vstutils/users/settings.js
+++ b/frontend_src/vstutils/users/settings.js
@@ -1,4 +1,4 @@
-import { signals } from '@/vstutils/signals';
+import { signals } from '#vstutils/signals';
 
 signals.once('models[_UserSettings].fields.beforeInit', (fields) => {
     fields.custom.title = 'Custom settings';
diff --git a/frontend_src/vstutils/utils/__tests__/utils.test.js b/frontend_src/vstutils/utils/__tests__/utils.test.js
index 36f5b297..f47c2806 100644
--- a/frontend_src/vstutils/utils/__tests__/utils.test.js
+++ b/frontend_src/vstutils/utils/__tests__/utils.test.js
@@ -10,8 +10,8 @@ import {
     stringToBoolean,
     generatePassword,
     getRedirectUrlFromResponse,
-} from '@/vstutils/utils';
-import { i18n } from '@/vstutils/translation';
+} from '#vstutils/utils';
+import { i18n } from '#vstutils/translation';
 import { createApp } from '../../../unittests/create-app';
 
 describe('utils', () => {
diff --git a/frontend_src/vstutils/utils/app-helpers.ts b/frontend_src/vstutils/utils/app-helpers.ts
index 8d7f8b47..33b620f3 100644
--- a/frontend_src/vstutils/utils/app-helpers.ts
+++ b/frontend_src/vstutils/utils/app-helpers.ts
@@ -1,4 +1,4 @@
-import type { IAppInitialized } from '@/vstutils/app';
+import type { IAppInitialized } from '#vstutils/app';
 
 let __appRef = null as unknown as IAppInitialized;
 
diff --git a/frontend_src/vstutils/utils/index.ts b/frontend_src/vstutils/utils/index.ts
index faa1268b..5dd9b828 100644
--- a/frontend_src/vstutils/utils/index.ts
+++ b/frontend_src/vstutils/utils/index.ts
@@ -5,8 +5,8 @@ import type { ParameterType } from 'swagger-schema-official';
 import type { defineStore } from 'pinia';
 import type { Field } from '../fields/base/Field';
 import type { Route, Location } from 'vue-router';
-import type { Model, ModelConstructor } from '@/vstutils/models';
-import type { IView, PageView, Sublink } from '@/vstutils/views';
+import type { Model, ModelConstructor } from '#vstutils/models';
+import type { IView, PageView, Sublink } from '#vstutils/views';
 
 export * from './todo.js';
 export * from './app-helpers';
@@ -192,10 +192,12 @@ export function createPropertyProxy<Obj extends object, Prop extends keyof Obj>(
     });
 }
 
-declare const innerDataMarker: unique symbol;
-declare const representDataMarker: unique symbol;
+export const innerDataMarker = '__inner_data';
+export const representDataMarker = '__represent_data';
 
-export type InnerData<T extends object = Record<string, unknown>> = T & { readonly [innerDataMarker]: true };
+export type InnerData<T extends object = Record<string, unknown>> = T & {
+    readonly [innerDataMarker]: true;
+};
 
 export type RepresentData<T extends object = Record<string, unknown>> = T & {
     readonly [representDataMarker]: true;
@@ -287,10 +289,6 @@ export function joinPaths(...paths: (string | number | undefined | null)[]) {
 
 /**
  * Function that formats path from params and replaces last param with instance's id
- * @param {string} path
- * @param {Object} params
- * @param {Model} instance
- * @return {string}
  */
 export function formatPath(path: string, params: Record<string, unknown>, instance?: Model) {
     for (const [name, value] of Object.entries(params)) {
diff --git a/frontend_src/vstutils/utils/localSettings.js b/frontend_src/vstutils/utils/localSettings.js
index f78bbb5c..c53cbf68 100644
--- a/frontend_src/vstutils/utils/localSettings.js
+++ b/frontend_src/vstutils/utils/localSettings.js
@@ -2,7 +2,7 @@
  * Class, that manages manipulations with Local Storage.
  * It is used for saving some users local settings to the one property(object) of Local Storage.
  */
-import { signals } from '@/vstutils/signals';
+import { signals } from '#vstutils/signals';
 
 export class LocalSettings {
     /**
diff --git a/frontend_src/vstutils/utils/todo.js b/frontend_src/vstutils/utils/todo.js
index 5e8e02ed..b54a877e 100644
--- a/frontend_src/vstutils/utils/todo.js
+++ b/frontend_src/vstutils/utils/todo.js
@@ -39,7 +39,7 @@ String.prototype.format = function () {
 
 /**
  * Function search and return all `{key}` in string.
- * @return {array} array of {key} in string.
+ * @return {Array} array of {key} in string.
  */
 String.prototype.format_keys = function () {
     let thisObj = this;
@@ -577,7 +577,7 @@ export const obj_prop_retriever = new ObjectPropertyRetriever();
  * Function, that finds the most appropriate (closest) path from path array to current_path.
  * It's supposed, that values in 'paths' array' were previously sorted.
  * It's supposed, that 'paths' array does not contain all application paths.
- * @param {array} paths Array with paths({string}).
+ * @param {Array} paths Array with paths({string}).
  * @param {string} current_path Path, based on which function makes search.
  */
 export function findClosestPath(paths, current_path) {
@@ -858,8 +858,8 @@ export function generateBase32String(length = 32) {
 }
 
 /**
- * @param {Iterable<import('@/vstutils/fields/base').Field>} fields
- * @param {RepresentData} data
+ * @param {Iterable<import('#vstutils/fields/base').Field>} fields
+ * @param {import('../utils/index').RepresentData} data
  * @return {string[]}
  */
 export function classesFromFields(fields, data) {
@@ -909,8 +909,8 @@ export function pathToArray(path) {
 
 /**
  * Function that checks if instances in two lists are the same
- * @param {Model[]} a
- * @param {Model[]} b
+ * @param {(import('../models/Model').Model)[]} a
+ * @param {(import('../models/Model').Model)[]} b
  */
 export function isInstancesEqual(a, b) {
     if (a === b) return true;
diff --git a/frontend_src/vstutils/views/View.ts b/frontend_src/vstutils/views/View.ts
index 71aade20..6d839087 100644
--- a/frontend_src/vstutils/views/View.ts
+++ b/frontend_src/vstutils/views/View.ts
@@ -13,10 +13,10 @@ import {
     pathToArray,
     RequestTypes,
     ViewTypes,
-} from '@/vstutils/utils';
+} from '#vstutils/utils';
 
-import ListViewComponent from '@/vstutils/components/list/ListViewComponent.vue';
-import OneEntity from '@/vstutils/components/page/OneEntity.vue';
+import ListViewComponent from '#vstutils/components/list/ListViewComponent.vue';
+import OneEntity from '#vstutils/components/page/OneEntity.vue';
 import {
     createActionViewStore,
     createDetailViewStore,
@@ -24,12 +24,12 @@ import {
     createListViewStore,
     createNewViewStore,
     useBasePageData,
-} from '@/vstutils/store';
-import { i18n } from '@/vstutils/translation';
+} from '#vstutils/store';
+import { i18n } from '#vstutils/translation';
 
 import type { ComponentOptionsMixin } from 'vue/types/v3-component-options';
-import type { IAppInitialized } from '@/vstutils/app';
-import type { Model, ModelConstructor } from '@/vstutils/models';
+import type { IAppInitialized } from '#vstutils/app';
+import type { Model, ModelConstructor } from '#vstutils/models';
 import type {
     BaseViewStore,
     ListViewStore,
@@ -38,9 +38,9 @@ import type {
     ActionStore,
     PageEditStore,
     DetailViewStore,
-} from '@/vstutils/store';
+} from '#vstutils/store';
 
-import type { HttpMethod, RepresentData } from '@/vstutils/utils';
+import type { HttpMethod, RepresentData } from '#vstutils/utils';
 import type { Vue } from 'vue/types/vue';
 import type { Route, RouteConfig } from 'vue-router';
 import type { Operation as SwaggerOperation } from 'swagger-schema-official';
@@ -132,7 +132,7 @@ export interface ViewParams extends SwaggerOperation {
 
 export type ViewStore<T extends IView> = ReturnType<T['_createStore']>;
 
-interface ResolveStateArg<S> {
+export interface ResolveStateArg<S> {
     route: Route;
     store?: S;
 }
@@ -327,7 +327,7 @@ export abstract class BaseView<
         return props;
     }
 
-    toRoute() {
+    toRoute(): RouteConfig | undefined {
         if (this.hidden) {
             return;
         }
diff --git a/frontend_src/vstutils/views/ViewConstructor.js b/frontend_src/vstutils/views/ViewConstructor.js
index 352c52e6..3b5d0625 100644
--- a/frontend_src/vstutils/views/ViewConstructor.js
+++ b/frontend_src/vstutils/views/ViewConstructor.js
@@ -9,13 +9,13 @@ import {
     RequestTypes,
     ViewTypes,
 } from '../utils';
-import { signals } from '@/vstutils/signals';
+import { signals } from '#vstutils/signals';
 import { QuerySet, SingleEntityQueryset } from '../querySet';
 import { NoModel } from '../models';
 import { ActionView, ListView, PageEditView, PageNewView, PageView, View } from './View.ts';
 import DetailWithoutListPageMixin from '../components/page/DetailWithoutListPageMixin.js';
 import NotEmptyMultiactionModal from '../components/list/NotEmptyMultiactionModal.vue';
-import { NotFound, Home } from '@/vstutils/router/customPages';
+import { NotFound, Home } from '#vstutils/router/customPages';
 import { openapi_dictionary } from './openapi';
 
 /**
@@ -47,8 +47,8 @@ export default class ViewConstructor {
      * Constructor of ViewConstructor class.
      * @param {object|undefined} dictionary Dict, that has info about properties names in OpenApi Schema
      * and some settings for views of different types.
-     * @param {ModelsResolver} modelsResolver
-     * @param {FieldsResolver} fieldsResolver
+     * @param {import('../models/ModelsResolver').ModelsResolver} modelsResolver
+     * @param {import('../fields/FieldsResolver').FieldsResolver} fieldsResolver
      */
     constructor(dictionary, modelsResolver, fieldsResolver) {
         this.dictionary = dictionary ?? openapi_dictionary;
@@ -538,7 +538,7 @@ export default class ViewConstructor {
 
     /**
      * Method, that generates new guiField objects for View filters.
-     * @return {Object<string, BaseField>}
+     * @return {Object<string, import('../fields/base/Field').Field>}
      */
     _generateFilters(path, parameters, listModel) {
         const filters = {};
diff --git a/frontend_src/vstutils/views/ViewsTree.js b/frontend_src/vstutils/views/ViewsTree.js
index 9719ca69..221a9a3a 100644
--- a/frontend_src/vstutils/views/ViewsTree.js
+++ b/frontend_src/vstutils/views/ViewsTree.js
@@ -3,7 +3,7 @@ import { pathToArray } from '../utils';
 class Node {
     /**
      * @param {string|null} fragment - Part of view path
-     * @param {View} view
+     * @param {import('./View').View} view
      */
     constructor(fragment = null, view = null) {
         this.fragment = fragment;
@@ -73,7 +73,7 @@ export class ViewsTree {
     }
 
     /**
-     * @param {Map<string, View>} views
+     * @param {Map<string, import('./View').View>} views
      * @return {Node}
      */
     static buildViewsTree(views) {
@@ -93,7 +93,7 @@ export class ViewsTree {
 
     /**
      * @callback ViewMatcher
-     * @param {View} view
+     * @param {import('./View').View} view
      * @return {boolean}
      */
 
diff --git a/frontend_src/vstutils/views/__tests__/ViewConstructor.test.js b/frontend_src/vstutils/views/__tests__/ViewConstructor.test.js
index 17b242d1..a482c76c 100644
--- a/frontend_src/vstutils/views/__tests__/ViewConstructor.test.js
+++ b/frontend_src/vstutils/views/__tests__/ViewConstructor.test.js
@@ -8,7 +8,7 @@ import { createSchema } from '../../../unittests/schema';
 import { StringField } from '../../fields/text';
 import { ArrayField } from '../../fields/array';
 import { NumberField } from '../../fields/numbers';
-import { OrderingChoicesField } from '@/vstutils/fields/choices';
+import { OrderingChoicesField } from '#vstutils/fields/choices';
 import { createApp } from '../../../unittests/create-app';
 
 describe('ViewConstructor', () => {
diff --git a/frontend_src/vstutils/views/__tests__/actions-generation.test.js b/frontend_src/vstutils/views/__tests__/actions-generation.test.js
index 73f2d527..52e36fcb 100644
--- a/frontend_src/vstutils/views/__tests__/actions-generation.test.js
+++ b/frontend_src/vstutils/views/__tests__/actions-generation.test.js
@@ -1,5 +1,5 @@
-import { createApp } from '@/unittests/create-app';
-import { createSchema } from '@/unittests/schema';
+import { createApp } from '#unittests/create-app';
+import { createSchema } from '#unittests/schema';
 import emptyActionSchema from './empty-action-schema.json';
 
 describe('ViewConstructor', () => {
diff --git a/frontend_src/vstutils/views/__tests__/file-responses.test.js b/frontend_src/vstutils/views/__tests__/file-responses.test.js
index 0967b810..6e540270 100644
--- a/frontend_src/vstutils/views/__tests__/file-responses.test.js
+++ b/frontend_src/vstutils/views/__tests__/file-responses.test.js
@@ -6,8 +6,8 @@ import {
     fetchMockCallAt,
     schemaListOf,
     waitForPageLoading,
-} from '@/unittests';
-import { openPage } from '@/vstutils/utils';
+} from '#unittests';
+import { openPage } from '#vstutils/utils';
 
 async function assertFileDownloaded(filename, url, f) {
     const HTMLAnchorElement = Object.getPrototypeOf(document.createElement('a'));
diff --git a/frontend_src/vstutils/views/__tests__/hidden-views.test.js b/frontend_src/vstutils/views/__tests__/hidden-views.test.js
index 08122f93..edfa2df9 100644
--- a/frontend_src/vstutils/views/__tests__/hidden-views.test.js
+++ b/frontend_src/vstutils/views/__tests__/hidden-views.test.js
@@ -1,5 +1,5 @@
-import { createApp, createSchema, schemaListOf } from '@/unittests';
-import { getApp } from '@/vstutils/utils';
+import { createApp, createSchema, schemaListOf } from '#unittests';
+import { getApp } from '#vstutils/utils';
 
 beforeAll(async () => {
     const some = {
diff --git a/frontend_src/vstutils/views/__tests__/main-action-execution.test.ts b/frontend_src/vstutils/views/__tests__/main-action-execution.test.ts
index 8b37c65b..991baf9d 100644
--- a/frontend_src/vstutils/views/__tests__/main-action-execution.test.ts
+++ b/frontend_src/vstutils/views/__tests__/main-action-execution.test.ts
@@ -6,7 +6,7 @@ import {
     waitForPageLoading,
     useTestCtx,
     expectNthRequest,
-} from '@/unittests';
+} from '#unittests';
 
 describe('main action execution', () => {
     beforeAll(async () => {
diff --git a/frontend_src/vstutils/views/openapi.ts b/frontend_src/vstutils/views/openapi.ts
index ac84d026..4605ec2c 100644
--- a/frontend_src/vstutils/views/openapi.ts
+++ b/frontend_src/vstutils/views/openapi.ts
@@ -1,4 +1,5 @@
-import { getApp, ViewTypes } from '@/vstutils/utils';
+import { defineAsyncComponent } from 'vue';
+import { getApp, ViewTypes } from '#vstutils/utils';
 
 import type {
     Action,
@@ -51,7 +52,9 @@ export const openapi_dictionary = {
                     isMultiAction: true,
                     style: { order: 100, marginLeft: 'auto' },
                     doNotGroup: true,
-                    component: () => import('@/vstutils/components/common/NestedDeletionModal.vue'),
+                    component: defineAsyncComponent(
+                        () => import('#vstutils/components/common/NestedDeletionModal.vue'),
+                    ),
                 },
             },
             list: {
@@ -66,7 +69,9 @@ export const openapi_dictionary = {
                 add: {
                     name: 'add',
                     title: 'Add',
-                    component: () => import('@/vstutils/components/list/AddChildModal.vue'),
+                    component: defineAsyncComponent(
+                        () => import('#vstutils/components/list/AddChildModal.vue'),
+                    ),
                     classes: ['btn', 'btn-primary'],
                     iconClasses: ['fa', 'fa-folder-open'],
                     style: { order: -10 },
@@ -76,7 +81,9 @@ export const openapi_dictionary = {
                     name: 'filters',
                     title: '',
                     iconClasses: ['fas', 'fa-filter'],
-                    component: () => import('@/vstutils/components/list/FiltersModal.vue'),
+                    component: defineAsyncComponent(
+                        () => import('#vstutils/components/list/FiltersModal.vue'),
+                    ),
                     style: { order: -5 },
                     doNotGroup: true,
                 },
@@ -94,7 +101,9 @@ export const openapi_dictionary = {
                     name: 'filters',
                     title: '',
                     iconClasses: ['fas', 'fa-filter'],
-                    component: () => import('@/vstutils/components/page/FiltersModalDetail.vue'),
+                    component: defineAsyncComponent(
+                        () => import('#vstutils/components/page/FiltersModalDetail.vue'),
+                    ),
                     style: { order: -5 },
                     doNotGroup: true,
                 },
diff --git a/frontend_src/vstutils/webpush.ts b/frontend_src/vstutils/webpush.ts
index 8a757726..99ea798a 100644
--- a/frontend_src/vstutils/webpush.ts
+++ b/frontend_src/vstutils/webpush.ts
@@ -1,12 +1,12 @@
 /* eslint-disable */
 
-import { type IApp } from '@/vstutils/app';
-import { BooleanField, BooleanFieldMixin } from '@/vstutils/fields/boolean';
-import { type Model } from '@/vstutils/models';
-import { guiPopUp } from '@/vstutils/popUp';
-import { onFilterOperations, onSchemaViewsCreated, signals, useSignalSubscription } from '@/vstutils/signals';
-import { HttpMethods, formatPath, getApp, joinPaths } from '@/vstutils/utils';
-import { type PageEditView } from '@/vstutils/views';
+import { type IApp } from '#vstutils/app';
+import { BooleanField, BooleanFieldMixin } from '#vstutils/fields/boolean';
+import { type Model } from '#vstutils/models';
+import { guiPopUp } from '#vstutils/popUp';
+import { onFilterOperations, onSchemaViewsCreated, signals, useSignalSubscription } from '#vstutils/signals';
+import { HttpMethods, formatPath, getApp, joinPaths } from '#vstutils/utils';
+import { type PageEditView } from '#vstutils/views';
 import { defineComponent, ref } from 'vue';
 import { type DefaultXOptions, type FieldOptions } from './fields/base';
 
diff --git a/package.json b/package.json
index dd124ed4..5647221d 100644
--- a/package.json
+++ b/package.json
@@ -15,22 +15,20 @@
     "node": ">=20.15.0"
   },
   "exports": {
-    ".": {
-      "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
-    },
-    "./auth-app": {
-      "import": "./dist/auth-app.js",
-      "types": "./dist/auth-app.d.ts"
-    },
-    "./style.css": {
-      "import": "./dist/style.css"
-    }
+    ".": "./frontend_src/index.ts",
+    "./auth-app": "./frontend_src/auth-app.ts",
+    "./style.css": "./frontend_src/style.css"
+  },
+  "imports": {
+    "#unittests/*": "./frontend_src/unittests/*",
+    "#unittests": "./frontend_src/unittests",
+    "#vstutils/*": "./frontend_src/vstutils/*",
+    "#libs/*": "./frontend_src/libs/*"
   },
   "scripts": {
     "build": "vite build -c frontend_src/spa/vite.config.ts",
     "devBuild": "vite build -c frontend_src/spa/vite.config.ts --mode development",
-    "build-lib": "vite build -c frontend_src/vite.config.ts",
+    "build-lib": "tsx frontend_src/build-package.ts",
     "lint:code": "eslint --ext .js,.vue,.ts frontend_src/",
     "lint:types": "vue-tsc --noEmit -p ./frontend_src/tsconfig.json",
     "lint": "conc --group --timings npm:lint:*",
@@ -103,6 +101,7 @@
     "select2": "4.1.0-rc.0",
     "select2-bootstrap-5-theme": "^1.3.0",
     "swiper": "^11.1.4",
+    "tsx": "^4.16.2",
     "typescript": "^5.4.5",
     "visibilityjs": "^2.0.2",
     "vite": "^5.3.1",
diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index db0b9e47..e885ddac 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -127,43 +127,6 @@
     }
 }
 
-packaje_json_data = {
-    "name": "test_project",
-    "version": "1.0.0",
-    "browserslist": [
-        "> 0.25%",
-        "not dead"
-    ],
-    "scripts": {
-        "build": "APP_ENV=prod webpack --json test_project/static/test_project/bundle/output.json",
-        "devBuild": "webpack --json test_project/static/test_project/bundle/output.json",
-        "lint": "eslint --ext .js,.vue frontend_src/"
-    },
-    "dependencies": {},
-    "devDependencies": {
-        "@babel/core": "^7.23.6",
-        "@babel/eslint-parser": "^7.23.3",
-        "@babel/plugin-transform-runtime": "^7.23.6",
-        "@babel/preset-env": "^7.23.6",
-        "babel-loader": "^9.1.3",
-        "css-loader": "^6.8.1",
-        "dotenv": "^16.3.1",
-        "eslint": "^8.56.0",
-        "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-prettier": "^5.1.2",
-        "eslint-plugin-vue": "^9.19.2",
-        "prettier": "^3.1.1",
-        "sass": "^1.69.5",
-        "sass-loader": "^13.3.3",
-        "style-loader": "^3.3.3",
-        "vue": "^2.7.16",
-        "vue-loader": "^15.11.1",
-        "webpack": "^5.89.0",
-        "webpack-bundle-analyzer": "^4.10.1",
-        "webpack-cli": "^5.1.4"
-    }
-}
-
 validator_dict = {
     'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
 }
@@ -241,7 +204,37 @@ def test_startproject(self):
         self.assertTrue(os.path.isfile(self.project_place + '/README.rst'))
         self.assertTrue(os.path.isfile(self.project_place + '/MANIFEST.in'))
         self.assertTrue(os.path.isfile(self.project_place + '/test.py'))
-        self.assertDictEqual(json.loads(Path(self.project_place + '/package.json').read_text()), packaje_json_data)
+        actual_package_json = json.loads(Path(self.project_place + '/package.json.default').read_text())
+        self.assertDictEqual(actual_package_json, {
+            "name": "test_project",
+            "version": "1.0.0",
+            "engines": {
+                "node": ">=20.15.0"
+            },
+            "scripts": {
+                "build": "vite build --config ./frontend_src/vite.config.ts --mode development",
+                "devBuild": "vite build --config ./frontend_src/vite.config.ts",
+                "lint:format": "prettier --check frontend_src",
+                "lint:code": "oxlint frontend_src",
+                "lint:types": "vue-tsc --noEmit -p ./frontend_src/tsconfig.json",
+                "lint": "conc npm:lint:* --group --timings"
+            },
+            "devDependencies": {
+                "@types/node": "^20.14.12",
+                "@vitejs/plugin-vue2": "^2.3.1",
+                "@vitejs/plugin-vue2-jsx": "^1.1.1",
+                "@vstconsulting/vstutils": actual_package_json["devDependencies"].get("@vstconsulting/vstutils"),
+                "concurrently": "^8.2.2",
+                "oxlint": "^0.3.5",
+                "prettier": "3.2.5",
+                "sass": "^1.48.0",
+                "typescript": "^5.5.3",
+                "vite": "^5.3.4",
+                "vue": "^2.7.16",
+                "vue-i18n": "8",
+                "vue-tsc": "^2.0.16",
+            }
+        })
 
         self.remove_project_place(self.project_place)
         with self.assertRaises(Exception):
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 82de12a0..475580c6 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b20'
+__version__: str = '5.10.0b21'
diff --git a/vstutils/management/commands/newproject.py b/vstutils/management/commands/newproject.py
index b4cc78d7..9dd0b526 100644
--- a/vstutils/management/commands/newproject.py
+++ b/vstutils/management/commands/newproject.py
@@ -1,5 +1,6 @@
 import typing as _t
 import os
+import re
 from pathlib import Path
 
 from ._base import BaseCommand
@@ -20,12 +21,12 @@ class Command(BaseCommand):
 
     files_to_create = {
         'frontend_src': {
-            'app': {
-                'index.js': Path('index.js')
-            },
             '.editorconfig': Path('.editorconfig'),
-            '.eslintrc.js': Path('.eslintrc.js'),
-            '.prettierrc': Path('.prettierrc')
+            '.prettierrc': Path('.prettierrc'),
+            'index.html': Path('index.html'),
+            'index.ts': Path('index.ts'),
+            'tsconfig.json': Path('tsconfig.json'),
+            'vite.config.ts': Path('vite.config.ts'),
         },
         '{project_name}': {
             'models': {
@@ -40,7 +41,7 @@ class Command(BaseCommand):
         },
         '.gitignore': Path('.gitignore'),
         'MANIFEST.in': Path('MANIFEST.in'),
-        'package.json': Path('package.json'),
+        'package.json.default': Path('package.json.default'),
         'README.rst': Path('README.rst'),
         'requirements.txt': Path('requirements.txt'),
         'requirements-test.txt': Path('requirements-test.txt'),
@@ -49,7 +50,6 @@ class Command(BaseCommand):
         'test.py': Path('test.py'),
         'tox.ini': Path('tox.ini'),
         'tox_build.ini': Path('tox_build.ini'),
-        'webpack.config.js.default': Path('webpack.config.js.default')
     }
 
     def add_arguments(self, parser):
@@ -86,6 +86,7 @@ def get_render_kwargs(self, options):
             'project_place': self._from_user('dir', options),
             'project_gui_name': project_gui_name,
             'vstutils_version': __version__,
+            'vstutils_version_npm': re.sub(r'b(\d+)$', '-b$1', __version__, count=1),
             'project_gui_name_head_lines': '=' * len(project_gui_name)
         }
 
diff --git a/vstutils/templates/newproject/.gitignore.template b/vstutils/templates/newproject/.gitignore.template
index f8294e45..6ca9bca7 100644
--- a/vstutils/templates/newproject/.gitignore.template
+++ b/vstutils/templates/newproject/.gitignore.template
@@ -153,3 +153,5 @@ node_modules/
 
 # sqlite
 {{project_name}}/db.{{project_name}}.sqlite3
+
+/*/static/spa/
diff --git a/vstutils/templates/newproject/frontend_src/.babelrc.js.template b/vstutils/templates/newproject/frontend_src/.babelrc.js.template
deleted file mode 100644
index 335a22e3..00000000
--- a/vstutils/templates/newproject/frontend_src/.babelrc.js.template
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-    presets: ['@babel/preset-env'],
-    plugins: [
-        '@babel/plugin-transform-runtime',
-    ],
-};
diff --git a/vstutils/templates/newproject/frontend_src/.editorconfig.template b/vstutils/templates/newproject/frontend_src/.editorconfig.template
index f821fcc2..dcfced6b 100644
--- a/vstutils/templates/newproject/frontend_src/.editorconfig.template
+++ b/vstutils/templates/newproject/frontend_src/.editorconfig.template
@@ -1,7 +1,6 @@
-[*.{js,vue}]
+[*.{js,vue,ts,tsx}]
 indent_style = space
-indent_size = 4
-tab_width = 4
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
diff --git a/vstutils/templates/newproject/frontend_src/.eslintrc.js.template b/vstutils/templates/newproject/frontend_src/.eslintrc.js.template
deleted file mode 100644
index 1e0643dd..00000000
--- a/vstutils/templates/newproject/frontend_src/.eslintrc.js.template
+++ /dev/null
@@ -1,28 +0,0 @@
-module.exports = {
-    extends: ['eslint:recommended', 'plugin:vue/recommended', 'plugin:prettier/recommended'],
-    parser: 'vue-eslint-parser',
-    parserOptions: {
-        parser: '@babel/eslint-parser',
-        sourceType: 'module',
-    },
-    env: {
-        browser: true,
-        commonjs: true,
-        es6: true,
-        node: true,
-    },
-    rules: {
-        'no-debugger': 'error',
-        'prettier/prettier': 'error',
-        'vue/html-indent': ['error', 4],
-        'vue/html-self-closing': ['error', { html: { void: 'any' } }],
-        'vue/max-attributes-per-line': 'off',
-        'vue/multi-word-component-names': 'off',
-        'vue/no-empty-component-block': 'error',
-    },
-    globals: {
-        spa: 'readonly',
-        app: 'readonly',
-        Vue: 'readonly',
-    },
-};
diff --git a/vstutils/templates/newproject/frontend_src/.prettierrc.template b/vstutils/templates/newproject/frontend_src/.prettierrc.template
index 0eb166b5..a4f366cb 100644
--- a/vstutils/templates/newproject/frontend_src/.prettierrc.template
+++ b/vstutils/templates/newproject/frontend_src/.prettierrc.template
@@ -1,18 +1,5 @@
 {
-    "arrowParens": "always",
-    "bracketSpacing": true,
-    "htmlWhitespaceSensitivity": "ignore",
-    "insertPragma": false,
-    "bracketSameLine": false,
-    "jsxSingleQuote": false,
-    "printWidth": 110,
-    "proseWrap": "preserve",
-    "quoteProps": "as-needed",
-    "requirePragma": false,
-    "semi": true,
-    "singleQuote": true,
-    "tabWidth": 4,
-    "trailingComma": "all",
-    "useTabs": false,
-    "vueIndentScriptAndStyle": true
+  "printWidth": 110,
+  "semi": true,
+  "singleQuote": true
 }
diff --git a/vstutils/templates/newproject/frontend_src/app/index.js.template b/vstutils/templates/newproject/frontend_src/app/index.js.template
deleted file mode 100644
index e69de29b..00000000
diff --git a/vstutils/templates/newproject/frontend_src/index.html.template b/vstutils/templates/newproject/frontend_src/index.html.template
new file mode 100644
index 00000000..54bd0f69
--- /dev/null
+++ b/vstutils/templates/newproject/frontend_src/index.html.template
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>{{ project_gui_name }}</title>
+    <link href="/manifest.json" rel="manifest" />
+    <link href="@vstconsulting/vstutils/style.css" rel="stylesheet" />
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="./index.ts"></script>
+  </body>
+</html>
diff --git a/vstutils/templates/newproject/frontend_src/index.ts.template b/vstutils/templates/newproject/frontend_src/index.ts.template
new file mode 100644
index 00000000..1bb7fb99
--- /dev/null
+++ b/vstutils/templates/newproject/frontend_src/index.ts.template
@@ -0,0 +1,7 @@
+import { initApp } from '@vstconsulting/vstutils';
+
+initApp({
+  api: {
+    url: new URL('/api/', window.location.origin).toString(),
+  },
+});
diff --git a/vstutils/templates/newproject/frontend_src/tsconfig.json.template b/vstutils/templates/newproject/frontend_src/tsconfig.json.template
new file mode 100644
index 00000000..e4828ba9
--- /dev/null
+++ b/vstutils/templates/newproject/frontend_src/tsconfig.json.template
@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "skipLibCheck": true,
+    "allowJs": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "preserve",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": ["**/*.ts", "**/*.tsx", "**/*.vue"]
+}
diff --git a/vstutils/templates/newproject/frontend_src/vite.config.ts.template b/vstutils/templates/newproject/frontend_src/vite.config.ts.template
new file mode 100644
index 00000000..10196dc3
--- /dev/null
+++ b/vstutils/templates/newproject/frontend_src/vite.config.ts.template
@@ -0,0 +1,26 @@
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import vue from '@vitejs/plugin-vue2';
+import vueJsx from '@vitejs/plugin-vue2-jsx';
+import { defineConfig } from 'vite';
+
+const currentDir = dirname(fileURLToPath(import.meta.url));
+
+export default defineConfig(({ mode }) => {
+  const isDev = mode === 'development';
+
+  return {
+    root: currentDir,
+    base: '/spa/',
+    plugins: [vue(), vueJsx()],
+    build: {
+      emptyOutDir: true,
+      outDir: join(currentDir, '..', '{{ project_name }}', 'static', 'spa'),
+      sourcemap: isDev,
+      minify: !isDev,
+    },
+    resolve: {
+      dedupe: ['vue'],
+    },
+  };
+});
diff --git a/vstutils/templates/newproject/package.json.default.template b/vstutils/templates/newproject/package.json.default.template
new file mode 100644
index 00000000..47496695
--- /dev/null
+++ b/vstutils/templates/newproject/package.json.default.template
@@ -0,0 +1,30 @@
+{
+  "name": "{{ project_name }}",
+  "version": "1.0.0",
+  "engines": {
+    "node": ">=20.15.0"
+  },
+  "scripts": {
+    "build": "vite build --config ./frontend_src/vite.config.ts --mode development",
+    "devBuild": "vite build --config ./frontend_src/vite.config.ts",
+    "lint:format": "prettier --check frontend_src",
+    "lint:code": "oxlint frontend_src",
+    "lint:types": "vue-tsc --noEmit -p ./frontend_src/tsconfig.json",
+    "lint": "conc npm:lint:* --group --timings"
+  },
+  "devDependencies": {
+    "@types/node": "^20.14.12",
+    "@vitejs/plugin-vue2": "^2.3.1",
+    "@vitejs/plugin-vue2-jsx": "^1.1.1",
+    "@vstconsulting/vstutils": "{{ vstutils_version }}",
+    "concurrently": "^8.2.2",
+    "oxlint": "^0.3.5",
+    "prettier": "3.2.5",
+    "sass": "^1.48.0",
+    "typescript": "^5.5.3",
+    "vite": "^5.3.4",
+    "vue": "^2.7.16",
+    "vue-i18n": "8",
+    "vue-tsc": "^2.0.16"
+  }
+}
diff --git a/vstutils/templates/newproject/package.json.template b/vstutils/templates/newproject/package.json.template
deleted file mode 100644
index b38594d7..00000000
--- a/vstutils/templates/newproject/package.json.template
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "name": "{{project_name}}",
-  "version": "1.0.0",
-  "browserslist": [
-    "> 0.25%",
-    "not dead"
-  ],
-  "scripts": {
-    "build": "APP_ENV=prod webpack --json {{project_name}}/static/{{project_name}}/bundle/output.json",
-    "devBuild": "webpack --json {{project_name}}/static/{{project_name}}/bundle/output.json",
-    "lint": "eslint --ext .js,.vue frontend_src/"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "@babel/core": "^7.23.6",
-    "@babel/eslint-parser": "^7.23.3",
-    "@babel/plugin-transform-runtime": "^7.23.6",
-    "@babel/preset-env": "^7.23.6",
-    "babel-loader": "^9.1.3",
-    "css-loader": "^6.8.1",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.56.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.2",
-    "eslint-plugin-vue": "^9.19.2",
-    "prettier": "^3.1.1",
-    "sass": "^1.69.5",
-    "sass-loader": "^13.3.3",
-    "style-loader": "^3.3.3",
-    "vue": "^2.7.16",
-    "vue-loader": "^15.11.1",
-    "webpack": "^5.89.0",
-    "webpack-bundle-analyzer": "^4.10.1",
-    "webpack-cli": "^5.1.4"
-  }
-}
diff --git a/vstutils/templates/newproject/project_name/settings.py.template b/vstutils/templates/newproject/project_name/settings.py.template
index 1d5e8e4b..d9f253d7 100644
--- a/vstutils/templates/newproject/project_name/settings.py.template
+++ b/vstutils/templates/newproject/project_name/settings.py.template
@@ -3,18 +3,3 @@ from vstutils.settings import *  # noqa: F403
 INSTALLED_APPS += [  # noqa: F405
     '{{project_name}}',
 ]
-
-# Uncomment lines below if you want to use default webpack config
-# SPA_STATIC_FILES_PROVIDERS[VST_PROJECT] = {
-#     'BACKEND': 'vstutils.static_files.WebpackJsonStaticObjectHandler',
-#     'OPTIONS': {
-#         'priority': 10,
-#         'json_file': os.path.join(
-#             os.path.dirname(vst_lib_module.__file__),
-#             'static',
-#             '{{project_name}}',
-#             'bundle',
-#             'output.json'
-#         ),
-#     }
-# }
\ No newline at end of file
diff --git a/vstutils/templates/newproject/webpack.config.js.default.template b/vstutils/templates/newproject/webpack.config.js.default.template
deleted file mode 100644
index a21e4577..00000000
--- a/vstutils/templates/newproject/webpack.config.js.default.template
+++ /dev/null
@@ -1,82 +0,0 @@
-const path = require('path');
-const {VueLoaderPlugin} = require('vue-loader');
-
-require('dotenv').config();
-const isProd = process.env.APP_ENV === 'prod';
-const showWarnings = process.env.SHOW_WARNINGS === 'true';
-
-const KB = 1024;
-const frontendSrc = path.resolve(__dirname, 'frontend_src');
-
-module.exports = {
-    mode: isProd ? 'production' : 'development',
-    entry: {
-        {{project_name}}: path.resolve(frontendSrc, 'app/index.js'),
-    },
-    output: {
-        path: path.resolve(__dirname, '{{project_name}}/static/{{project_name}}/bundle'),
-        clean: true,
-        filename: '[name].js',
-        chunkFilename: '[name].chunk.js',
-    },
-    plugins: [
-        new VueLoaderPlugin(),
-    ],
-    module: {
-        rules: [
-            {
-                test: /\.js$/,
-                loader: 'babel-loader',
-                exclude: [/node_modules/]
-            },
-            {
-                test: /\.((css)|(scss))$/i,
-                use: [
-                    'style-loader',
-                    {
-                        loader: 'css-loader',
-                        options: {
-                            url: {
-                                filter: (url) => !url.startsWith('/static/')
-                            }
-                        }
-                    },
-                    {
-                        loader: 'sass-loader',
-                        options: {
-                            sassOptions: {
-                                quietDeps: true
-                            }
-                        }
-                    }
-                ]
-            },
-            {
-                test: /.woff2$/,
-                type: 'asset',
-                parser: {
-                    dataUrlCondition: {maxSize: 100 * KB},
-                },
-
-            },
-            {
-                test: /.(png|jpg|jpeg|gif|svg|woff|ttf|eot)$/,
-                type: 'asset',
-                parser: {
-                    dataUrlCondition: {maxSize: 10 * KB},
-                },
-
-            },
-            {
-                test: /\.vue$/,
-                loader: 'vue-loader'
-            }
-        ]
-    },
-    stats: {
-        all: false,
-        entrypoints: true,
-        errors: true,
-        warnings: showWarnings,
-    },
-};
diff --git a/yarn.lock b/yarn.lock
index d2746885..e05dcd63 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2583,7 +2583,7 @@ esbuild@^0.20.1:
     "@esbuild/win32-ia32" "0.20.2"
     "@esbuild/win32-x64" "0.20.2"
 
-esbuild@^0.21.3:
+esbuild@^0.21.3, esbuild@~0.21.5:
   version "0.21.5"
   resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d"
   integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==
@@ -3088,6 +3088,13 @@ get-stream@^8.0.1:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2"
   integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==
 
+get-tsconfig@^4.7.5:
+  version "4.7.6"
+  resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.7.6.tgz#118fd5b7b9bae234cc7705a00cd771d7eb65d62a"
+  integrity sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==
+  dependencies:
+    resolve-pkg-maps "^1.0.0"
+
 glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -4669,6 +4676,11 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+resolve-pkg-maps@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f"
+  integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==
+
 resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
@@ -5218,6 +5230,16 @@ tslib@^2.1.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
 
+tsx@^4.16.2:
+  version "4.16.2"
+  resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.16.2.tgz#8722be119ae226ef0b4c6210d5ee90f3ba823f19"
+  integrity sha512-C1uWweJDgdtX2x600HjaFaucXTilT7tgUZHbOE4+ypskZ1OP8CRCSDkCxG6Vya9EwaFIVagWwpaVAn5wzypaqQ==
+  dependencies:
+    esbuild "~0.21.5"
+    get-tsconfig "^4.7.5"
+  optionalDependencies:
+    fsevents "~2.3.3"
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"

From a9d9eef4cc60d6eeedc8c38cc5350d1a1fb57583 Mon Sep 17 00:00:00 2001
From: Dmitriy Ovcharenko <ovcharenkodd@gmail.com>
Date: Fri, 26 Jul 2024 15:22:40 +1000
Subject: [PATCH 36/46] Docs: Update frontend quickstart

---
 doc/locale/ru/LC_MESSAGES/quickstart-front.po | 409 +++++++++---------
 doc/quickstart-front.rst                      |  78 ++--
 frontend_src/README.md                        |   4 +-
 3 files changed, 246 insertions(+), 245 deletions(-)

diff --git a/doc/locale/ru/LC_MESSAGES/quickstart-front.po b/doc/locale/ru/LC_MESSAGES/quickstart-front.po
index c2ed105d..3e98edfa 100644
--- a/doc/locale/ru/LC_MESSAGES/quickstart-front.po
+++ b/doc/locale/ru/LC_MESSAGES/quickstart-front.po
@@ -8,14 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VST Utils 5.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-24 08:36+0000\n"
+"POT-Creation-Date: 2024-07-26 04:59+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.12.1\n"
+"Generated-By: Babel 2.15.0\n"
+
 #: ../../quickstart-front.rst:2
 msgid "Frontend Quickstart"
 msgstr "Быстрый старт фронтенда"
@@ -28,9 +29,9 @@ msgid ""
 ":doc:`Backend Section <quickstart>` of this docs."
 msgstr ""
 "Фреймворк VST utils использует экосистему Vue для отображения фронтенда. "
-"Руководство по быстрому старту проведет вас через наиболее важные шаги по "
-"настройке функций фронтенда. Установка приложения и настройка описаны в - "
-":doc:`разделе Backend <quickstart>` этой документации."
+"Руководство по быстрому старту проведет вас через наиболее важные шаги по"
+" настройке функций фронтенда. Установка приложения и настройка описаны в "
+"- :doc:`разделе Backend <quickstart>` этой документации."
 
 #: ../../quickstart-front.rst:8
 msgid "There are several stages in vstutils app:"
@@ -50,8 +51,7 @@ msgstr ""
 
 #: ../../quickstart-front.rst:13
 msgid "loading open api schema from backend. Emits 'openapi.loaded' signal;"
-msgstr ""
-"загрузка схемы OpenAPI с бэкенда. Генерирует сигнал 'openapi.loaded';"
+msgstr "загрузка схемы OpenAPI с бэкенда. Генерирует сигнал 'openapi.loaded';"
 
 #: ../../quickstart-front.rst:14
 msgid "loading all static files from `SPA_STATIC` in setting.py;"
@@ -70,8 +70,9 @@ msgid ""
 "if there is centrifugoClient in settings.py connects it. To read more "
 "about centrifugo configuration check \":ref:`centrifugo`\";"
 msgstr ""
-"если в settings.py есть centrifugoClient, подключается к нему. Дополнительные "
-"сведения о конфигурации centrifugo можно найти в разделе \":ref:`centrifugo`\";"
+"если в settings.py есть centrifugoClient, подключается к нему. "
+"Дополнительные сведения о конфигурации centrifugo можно найти в разделе "
+"\":ref:`centrifugo`\";"
 
 #: ../../quickstart-front.rst:20
 msgid "downloading a list of available languages and translations;"
@@ -120,15 +121,17 @@ msgid ""
 "initialize model with `LocalSettings`. Find out more about this in the "
 "section :ref:`localSettings`;"
 msgstr ""
-"инициализация модели с `LocalSettings`. Узнайте больше об этом в разделе :ref:`localSettings`;"
+"инициализация модели с `LocalSettings`. Узнайте больше об этом в разделе "
+":ref:`localSettings`;"
 
 #: ../../quickstart-front.rst:28
 msgid ""
 "creates routerConstructor from `this.views`, emits 'app.beforeInitRouter'"
 " with { routerConstructor } and gets new VueRouter({this.routes});"
 msgstr ""
-"создание routerConstructor из `this.views`, генерация сигнала 'app.beforeInitRouter'"
-" с { routerConstructor } и получение нового VueRouter({this.routes});"
+"создание routerConstructor из `this.views`, генерация сигнала "
+"'app.beforeInitRouter' с { routerConstructor } и получение нового "
+"VueRouter({this.routes});"
 
 #: ../../quickstart-front.rst:29
 msgid ""
@@ -147,170 +150,208 @@ msgid ""
 "There is a flowchart representing application initialization process "
 "(signal names have red font):"
 msgstr ""
-"Есть схема, представляющая процесс инициализации приложения (названия сигналов красным шрифтом):"
-
-#: ../../quickstart-front.rst:75
-msgid "Field customization"
-msgstr "Настройка поля"
+"Есть схема, представляющая процесс инициализации приложения (названия "
+"сигналов красным шрифтом):"
 
 #: ../../quickstart-front.rst:76
-msgid "To add custom script to the project, set script name in settings.py"
-msgstr "Чтобы добавить собственный скрипт в проект, укажите его имя в settings.py"
+msgid "Frontend customization"
+msgstr "Настройка фронтенда"
+
+#: ../../quickstart-front.rst:77
+msgid ""
+"To use custom frontend in you project rename `vite.config.ts.default` to "
+"`vite.config.ts`. Every project based on vst-utils contains `index.ts` in"
+" `/frontend_src/` directory. This file is intended for your code. Run "
+"`yarn` command to install all dependencies. Then run `yarn devBuild` from"
+" root dir of your project to build static files."
+msgstr ""
+"Для настройки фронтенда переименуйте файл `vite.config.ts.default` в "
+"`vite.config.ts`. Каждый проект, основанный на vst-utils, содержит "
+"`index.ts` в каталоге `/frontend_src/`. Этот файл предназначен для вашего"
+" кода. Запустите команду `yarn` для установки всех зависимостей. Затем "
+"выполните `yarn devBuild` из корневого каталога вашего проекта для сборки"
+" статических файлов."
+
+#: ../../quickstart-front.rst:82
+msgid ""
+"Output files will be built into `{AppName}/static/spa` directory. During "
+"vstutils installation through `pip` frontend code are being build "
+"automatically, so you may need to add `spa` directory to `.gitignore`."
+msgstr ""
+"Выходные файлы будут собраны в каталоге `{AppName}/static/spa`. При "
+"установке vstutils через `pip` фронтенд код собирается автоматически, "
+"поэтому вам может потребоваться добавить каталог `spa` в `gitignore`."
 
 #: ../../quickstart-front.rst:85
-msgid "and put the script (`main.js`) in `{appName}/static/` directory."
-msgstr "и поместите скрипт (`main.js`) в каталог `{appName}/static/`."
+msgid "Example of simple frontend entrypoint:"
+msgstr "Пример точки входа фронтенда:"
 
-#: ../../quickstart-front.rst:87
+#: ../../quickstart-front.rst:102
+msgid "Field customization"
+msgstr "Настройка поля"
+
+#: ../../quickstart-front.rst:103
 msgid ""
 "In `main.js` create new field by extending it from BaseField (or any "
 "other appropriate field)"
 msgstr ""
-"В `main.js` создайте новое поле, расширив его от BaseField (или любого другого соответствующего поля)"
+"В `main.js` создайте новое поле, расширив его от BaseField (или любого "
+"другого подходящего поля)"
 
-#: ../../quickstart-front.rst:89
+#: ../../quickstart-front.rst:105
 msgid ""
 "For example lets create a field that renders HTML h1 element with 'Hello "
 "World!` text:"
 msgstr ""
-"Например, создадим поле, которое отображает элемент HTML h1 с текстом 'Привет, мир!'"
+"Например, создадим поле, которое отображает элемент HTML h1 с текстом "
+"'Привет, мир!'"
 
-#: ../../quickstart-front.rst:103
+#: ../../quickstart-front.rst:119
 msgid "Or render person's name with some prefix"
 msgstr "Или отобразите имя человека с некоторым префиксом"
 
-#: ../../quickstart-front.rst:118
+#: ../../quickstart-front.rst:134
 msgid ""
 "Register this field to `app.fieldsResolver` to provide appropriate field "
 "format and type to a new field"
 msgstr ""
-"Зарегистрируйте это поле в `app.fieldsResolver`, чтобы предоставить соответствующий формат и тип поля для нового поля"
+"Зарегистрируйте это поле в `app.fieldsResolver`, чтобы предоставить "
+"соответствующий формат и тип поля для нового поля"
 
-#: ../../quickstart-front.rst:125
+#: ../../quickstart-front.rst:141
 msgid ""
 "Listen for a appropriate "
 "`models[ModelWithFieldToChange].fields.beforeInit` signal to change field"
 " Format"
 msgstr ""
-"Слушайте подходящий сигнал `models[ModelWithFieldToChange].fields.beforeInit` для изменения формата поля"
+"Слушайте подходящий сигнал "
+"`models[ModelWithFieldToChange].fields.beforeInit` для изменения формата "
+"поля"
 
-#: ../../quickstart-front.rst:134
+#: ../../quickstart-front.rst:150
 msgid ""
 "List of  models and their fields is available during runtime in console "
 "at `app.modelsClasses`"
 msgstr ""
-"Список моделей и их полей доступен во время выполнения в консоли по адресу `app.modelsClasses`"
+"Список моделей и их полей доступен во время выполнения в консоли по "
+"адресу `app.modelsClasses`"
 
-#: ../../quickstart-front.rst:136
+#: ../../quickstart-front.rst:152
 msgid ""
 "To change Filed behavior, create new field class with a desired logic. "
 "Let's say you need to send number of milliseconds to API, user however "
 "wants to type in number of seconds. A solution would be to override "
 "field's `toInner` and `toRepresent` methods."
 msgstr ""
-"Чтобы изменить поведение поля, создайте новый класс поля с необходимой логикой. "
-"Допустим, вам нужно отправить API количество миллисекунд, но пользователь хочет "
-"вводить количество секунд. Решением будет переопределить методы `toInner` и `toRepresent` поля."
+"Чтобы изменить поведение поля, создайте новый класс поля с необходимой "
+"логикой. Допустим, вам нужно отправить API количество миллисекунд, но "
+"пользователь хочет вводить количество секунд. Решением будет "
+"переопределить методы `toInner` и `toRepresent` поля."
 
-#: ../../quickstart-front.rst:157
+#: ../../quickstart-front.rst:173
 msgid ""
 "Now you have field that show seconds, but saves/receives data in "
 "milliseconds on detail view of AllFieldsModel."
 msgstr ""
-"Теперь у вас есть поле, которое отображает секунды, но сохраняет/получает данные в "
-"миллисекундах в виде детализированного представления модели AllFieldsModel."
+"Теперь у вас есть поле, которое отображает секунды, но сохраняет/получает"
+" данные в миллисекундах в виде детализированного представления модели "
+"AllFieldsModel."
 
-#: ../../quickstart-front.rst:160
+#: ../../quickstart-front.rst:176
 msgid ""
 "If you need to show some warning or error to developer console you can "
 "use field `warn` and `error` methods. You can pass some message and it "
 "will print it with field type, model name and field name."
 msgstr ""
-"Если вам нужно показать какое-то предупреждение или ошибку в консоли разработчика, "
-"вы можете использовать методы `warn` и `error` поля. Вы можете передать сообщение, "
-"и оно будет выведено с типом поля, именем модели и именем поля."
+"Если вам нужно показать какое-то предупреждение или ошибку в консоли "
+"разработчика, вы можете использовать методы `warn` и `error` поля. Вы "
+"можете передать сообщение, и оно будет выведено с типом поля, именем "
+"модели и именем поля."
 
-#: ../../quickstart-front.rst:164
+#: ../../quickstart-front.rst:180
 msgid "Change path to FkField"
 msgstr "Изменение пути к полю FkField"
 
-#: ../../quickstart-front.rst:165
+#: ../../quickstart-front.rst:181
 msgid ""
 "Sometime you may need to request different set of objects for FkField. "
 "For example to choose from only famous authors, create `famous_author` "
 "endpoint on backend and set FkField request path to `famous_author`. "
 "Listen for `app.beforeInit` signal."
 msgstr ""
-"Иногда вам может потребоваться запросить другой набор объектов для FkField. "
-"Например, чтобы выбрать только известных авторов, создайте конечную точку `famous_author` "
-"на бэкенде и установите путь запроса FkField в `famous_author`. "
-"Слушайте сигнал `app.beforeInit`."
+"Иногда вам может потребоваться запросить другой набор объектов для "
+"FkField. Например, чтобы выбрать только известных авторов, создайте "
+"конечную точку `famous_author` на бэкенде и установите путь запроса "
+"FkField в `famous_author`. Слушайте сигнал `app.beforeInit`."
 
-#: ../../quickstart-front.rst:175
+#: ../../quickstart-front.rst:191
 msgid ""
 "Now when we create new post on `/post/` endpoint Author FkField makes get"
 " request to `/famous_author/` instead of `/author/`. It's useful to get "
 "different set of authors (that may have been previously filtered on "
 "backend)."
 msgstr ""
-"Теперь, когда мы создаем новый пост на конечной точке `/post/`, Author FkField выполняет GET-запрос "
-"к `/famous_author/` вместо `/author/`. Это полезно для получения другого набора авторов (которые могли быть "
-"ранее отфильтрованы на бэкенде)."
+"Теперь, когда мы создаем новый пост на конечной точке `/post/`, Author "
+"FkField выполняет GET-запрос к `/famous_author/` вместо `/author/`. Это "
+"полезно для получения другого набора авторов (которые могли быть ранее "
+"отфильтрованы на бэкенде)."
 
-#: ../../quickstart-front.rst:179
+#: ../../quickstart-front.rst:195
 msgid "CSS Styling"
 msgstr "Стилизация CSS"
 
-#: ../../quickstart-front.rst:181
-msgid "Like scripts, css files may be added to SPA_STATIC in setting.py"
-msgstr "Как и скрипты, файлы CSS можно добавить в SPA_STATIC в setting.py"
+#: ../../quickstart-front.rst:197
+msgid "Like scripts, css files may be added to `index.ts`"
+msgstr "Как скрипты, файлы CSS могут быть добавлены в `index.ts`"
 
-#: ../../quickstart-front.rst:192
+#: ../../quickstart-front.rst:212
 msgid ""
 "Let's inspect page and find css class for our customField. It is `column-"
 "format-customField` and  generated with `column-format-{Field.format}` "
 "pattern."
 msgstr ""
-"Давайте проанализируем страницу и найдем класс CSS для нашего пользовательского поля. "
-"Это `column-format-customField` и создается с использованием шаблона `column-format-{Field.format}`."
+"Давайте проанализируем страницу и найдем класс CSS для нашего "
+"пользовательского поля. Это `column-format-customField` и создается с "
+"использованием шаблона `column-format-{Field.format}`."
 
-#: ../../quickstart-front.rst:195
+#: ../../quickstart-front.rst:215
 msgid "Use regular css styling to change appearance of the field."
 msgstr "Используйте обычные стили CSS для изменения внешнего вида поля."
 
-#: ../../quickstart-front.rst:205
+#: ../../quickstart-front.rst:225
 msgid ""
 "Other page elements are also available for styling: for example, to hide "
 "certain column set corresponding field to none."
 msgstr ""
-"Другие элементы страницы также доступны для стилизации: например, чтобы скрыть "
-"определенный столбец, установите соответствующее поле в значение none."
+"Другие элементы страницы также доступны для стилизации: например, чтобы "
+"скрыть определенный столбец, установите соответствующее поле в значение "
+"none."
 
-#: ../../quickstart-front.rst:214
+#: ../../quickstart-front.rst:234
 msgid "Show primary key column on list"
 msgstr "Показать столбец первичных ключей в списке"
 
-#: ../../quickstart-front.rst:216
+#: ../../quickstart-front.rst:236
 msgid ""
 "Every pk column has `pk-column` CSS class and hidden by default (using "
 "`display: none;`)."
 msgstr ""
-"Каждый столбец первичного ключа имеет класс CSS `pk-column` и по умолчанию "
-"скрыт (с использованием `display: none;`)."
+"Каждый столбец первичного ключа имеет класс CSS `pk-column` и по "
+"умолчанию скрыт (с использованием `display: none;`)."
 
-#: ../../quickstart-front.rst:218
+#: ../../quickstart-front.rst:238
 msgid ""
 "For example this style will show pk column on all list views of `Order` "
 "model:"
 msgstr ""
-"Например, этот стиль покажет столбец первичных ключей во всех представлениях "
-"списка модели `Order`."
+"Например, этот стиль покажет столбец первичных ключей во всех "
+"представлениях списка модели `Order`."
 
-#: ../../quickstart-front.rst:228
+#: ../../quickstart-front.rst:248
 msgid "View customization"
 msgstr "Настройка представления"
 
-#: ../../quickstart-front.rst:230
+#: ../../quickstart-front.rst:250
 msgid ""
 "Listen for signal `\"allViews.created\"` and add new custom mixin to the "
 "view."
@@ -318,11 +359,13 @@ msgstr ""
 "Слушайте сигнал `\"allViews.created\"` и добавьте новый пользовательский "
 "миксин в представление."
 
-#: ../../quickstart-front.rst:232
+#: ../../quickstart-front.rst:252
 msgid "Next code snippet depicts rendering new view instead of default view."
-msgstr "В следующем фрагменте кода показано отображение нового представления вместо представления по умолчанию."
+msgstr ""
+"В следующем фрагменте кода показано отображение нового представления "
+"вместо представления по умолчанию."
 
-#: ../../quickstart-front.rst:245
+#: ../../quickstart-front.rst:265
 msgid ""
 "Learn more about Vue `render()` function at `Vue documentation "
 "<https://v3.vuejs.org/guide/render-function.html>`_."
@@ -330,135 +373,94 @@ msgstr ""
 "Узнайте больше о функции `render()` Vue в `документации Vue "
 "<https://v3.vuejs.org/guide/render-function.html>`_."
 
-#: ../../quickstart-front.rst:248
+#: ../../quickstart-front.rst:268
 msgid ""
 "It is also possible to fine tune View by overriding default computed "
 "properties and methods of existing mixins. For example, override "
 "breadcrumbs computed property to turn off breadcrumbs on Author list View"
 msgstr ""
-"Также можно настроить представление, переопределив вычисляемые свойства и "
-"методы по умолчанию существующих миксинов. Например, переопределите вычисляемое "
-"свойство `breadcrumbs` для отключения хлебных крошек в представлении списка авторов."
+"Также можно настроить представление, переопределив вычисляемые свойства и"
+" методы по умолчанию существующих миксинов. Например, переопределите "
+"вычисляемое свойство `breadcrumbs` для отключения хлебных крошек в "
+"представлении списка авторов."
 
-#: ../../quickstart-front.rst:265
+#: ../../quickstart-front.rst:285
 msgid ""
 "Sometimes you may need to hide detail page for some reason, but still "
 "want all actions and sublinks to be accessible from list page. To do it "
 "you also should listen signal `\"allViews.created\"` and change parameter"
 " `hidden` from default `false` to `true`, for example:"
 msgstr ""
-"Иногда вам может потребоваться скрыть страницу с деталями по какой-то причине, "
-"но при этом сохранить доступ ко всем действиям и подссылкам с страницы списка. "
-"Чтобы сделать это, также следует слушать сигнал `\"allViews.created\"` и изменить параметр "
-"`hidden` с значения `false` по умолчанию на `true`, например:"
+"Иногда вам может потребоваться скрыть страницу с деталями по какой-то "
+"причине, но при этом сохранить доступ ко всем действиям и подссылкам с "
+"страницы списка. Чтобы сделать это, также следует слушать сигнал "
+"`\"allViews.created\"` и изменить параметр `hidden` с значения `false` по"
+" умолчанию на `true`, например:"
 
-#: ../../quickstart-front.rst:277
+#: ../../quickstart-front.rst:297
 msgid "Changing title of the view"
 msgstr "Изменение заголовка представления"
 
-#: ../../quickstart-front.rst:279
+#: ../../quickstart-front.rst:299
 msgid ""
 "To change title and string displayed in the breadcrumbs change `title` "
 "property of the view or method `getTitle` for more complex logic."
 msgstr ""
-"Чтобы изменить заголовок и строку, отображаемую в хлебных крошках, измените "
-"свойство `title` представления или метод `getTitle` для более сложной логики."
-
-#: ../../quickstart-front.rst:293
-msgid "Basic Webpack configuration"
-msgstr "Базовая конфигурация Webpack"
-
-#: ../../quickstart-front.rst:294
-msgid ""
-"To use webpack in you project rename `webpack.config.js.default` to "
-"`webpack.config.js`. Every project based on vst-utils contains `index.js`"
-" in `/frontend_src/app/` directory. This file is intended for your code. "
-"Run `yarn` command to install all dependencies. Then run `yarn devBuild` "
-"from root dir of your project to build static files. Final step is to add"
-" built file to `SPA_STATIC` in `settings.py`"
-msgstr ""
-"Чтобы использовать webpack в вашем проекте, переименуйте `webpack.config.js.default` в "
-"`webpack.config.js`. Каждый проект, основанный на vst-utils, содержит `index.js`"
-" в каталоге `/frontend_src/app/`. Этот файл предназначен для вашего кода. "
-"Запустите команду `yarn` для установки всех зависимостей. Затем выполните `yarn devBuild` "
-"из корневого каталога вашего проекта для сборки статических файлов. Последним шагом является добавление "
-"собранного файла в `SPA_STATIC` в `settings.py`."
+"Чтобы изменить заголовок и строку, отображаемую в хлебных крошках, "
+"измените свойство `title` представления или метод `getTitle` для более "
+"сложной логики."
 
-#: ../../quickstart-front.rst:305
-msgid ""
-"Webpack configuration file allows to add more static files. In "
-"`webpack.config.js` add more entries"
-msgstr ""
-"Файл конфигурации Webpack позволяет добавлять дополнительные статические файлы. В "
-"`webpack.config.js` добавьте дополнительные записи"
-
-#: ../../quickstart-front.rst:316
-msgid ""
-"Output files will be built into "
-"`frontend_src/{AppName}/static/{AppName}/bundle` directory. Name of "
-"output file corresponds to name of entry in `config`. In the example "
-"above output files will have names `app.js` and `myapp.js`. Add all of "
-"these files to `STATIC_SPA` in `settings.py`. During vstutils "
-"installation trough `pip` frontend code are being build automatically, so"
-" you may need to add `bundle` directory to `gitignore`."
-msgstr ""
-"Выходные файлы будут собраны в каталоге "
-"`frontend_src/{AppName}/static/{AppName}/bundle`. Имя "
-"выходного файла соответствует имени записи в `config`. В приведенном выше "
-"примере выходные файлы будут называться `app.js` и `myapp.js`. Добавьте все эти "
-"файлы в `STATIC_SPA` в `settings.py`. Во время установки vstutils через `pip` "
-"фронтенд-код собирается автоматически, поэтому вам может потребоваться добавить "
-"каталог `bundle` в `gitignore`."
-
-#: ../../quickstart-front.rst:323
+#: ../../quickstart-front.rst:313
 msgid "Page store"
 msgstr "Хранилище страницы"
 
-#: ../../quickstart-front.rst:324
+#: ../../quickstart-front.rst:314
 msgid ""
 "Every page has store that can be accessed globally `app.store.page` or "
 "from page component using `this.store`."
 msgstr ""
-"У каждой страницы есть хранилище, которое можно получить глобально `app.store.page` "
-"или из компонента страницы с использованием `this.store`."
+"У каждой страницы есть хранилище, которое можно получить глобально "
+"`app.store.page` или из компонента страницы с использованием "
+"`this.store`."
 
-#: ../../quickstart-front.rst:326
+#: ../../quickstart-front.rst:316
 msgid "View method `extendStore` can be used to add custom logic to page's store."
 msgstr ""
-"Метод представления `extendStore` можно использовать для добавления пользовательской "
-"логики в хранилище страницы."
+"Метод представления `extendStore` можно использовать для добавления "
+"пользовательской логики в хранилище страницы."
 
-#: ../../quickstart-front.rst:352
+#: ../../quickstart-front.rst:342
 msgid "Overriding root component"
 msgstr "Переопределение корневого компонента"
 
-#: ../../quickstart-front.rst:353
+#: ../../quickstart-front.rst:343
 msgid ""
 "Root component of the application can be overridden using "
 "`app.beforeInit` signal. This can be useful for such things as changing "
 "layout CSS classes, back button behaviour or main layout components."
 msgstr ""
-"Корневой компонент приложения можно переопределить с использованием сигнала `app.beforeInit`. "
-"Это может быть полезно, например, для изменения классов CSS макета, поведения кнопки "
-"назад или основных компонентов макета."
+"Корневой компонент приложения можно переопределить с использованием "
+"сигнала `app.beforeInit`. Это может быть полезно, например, для изменения"
+" классов CSS макета, поведения кнопки назад или основных компонентов "
+"макета."
 
-#: ../../quickstart-front.rst:356
+#: ../../quickstart-front.rst:346
 msgid "Example of customizing sidebar component:"
 msgstr "Пример настройки компонента боковой панели:"
 
-#: ../../quickstart-front.rst:370
+#: ../../quickstart-front.rst:360
 msgid "Translating values of fields"
 msgstr "Перевод значений полей"
 
-#: ../../quickstart-front.rst:371
+#: ../../quickstart-front.rst:361
 msgid ""
 "Values tha displayed by `FKField` of `ChoicesField` can be translated "
 "using standard translations files."
 msgstr ""
-"Значения, отображаемые с использованием `FKField` или `ChoicesField`, могут быть переведены "
-"с использованием стандартных файлов перевода."
+"Значения, отображаемые с использованием `FKField` или `ChoicesField`, "
+"могут быть переведены с использованием стандартных файлов перевода."
 
-#: ../../quickstart-front.rst:373
+#: ../../quickstart-front.rst:363
 msgid ""
 "Translation key must be defined as "
 "`:model:<ModelName>:<fieldName>:<value>`. For example:"
@@ -466,92 +468,97 @@ msgstr ""
 "Ключ перевода должен быть определен как "
 "`:model:<ModelName>:<fieldName>:<value>`. Например:"
 
-#: ../../quickstart-front.rst:381
+#: ../../quickstart-front.rst:371
 msgid ""
 "Translation of values can be taxing as every model on backend usually "
 "generates more than one model on frontend, To avoid this, add "
 "`_translate_model = 'Category'` attribute to model on backend. It "
 "shortens"
 msgstr ""
-"Перевод значений может быть трудоемким, поскольку каждая модель на бэкенде обычно "
-"генерирует более одной модели на фронтенде. Для избежания этого добавьте "
-"атрибут `_translate_model = 'Category'` к модели на бэкенде. Это сокращает"
+"Перевод значений может быть трудоемким, поскольку каждая модель на "
+"бэкенде обычно генерирует более одной модели на фронтенде. Для избежания "
+"этого добавьте атрибут `_translate_model = 'Category'` к модели на "
+"бэкенде. Это сокращает"
 
-#: ../../quickstart-front.rst:391
+#: ../../quickstart-front.rst:381
 msgid "to"
 msgstr "в"
 
-#: ../../quickstart-front.rst:397
+#: ../../quickstart-front.rst:387
 msgid ""
 "For `FKField` name of the related model is used. And `fieldName` should "
 "be equal to `viewField`."
 msgstr ""
-"Для `FKField` используется имя связанной модели. И `fieldName` должно быть равно `viewField`."
+"Для `FKField` используется имя связанной модели. И `fieldName` должно "
+"быть равно `viewField`."
 
-#: ../../quickstart-front.rst:403
+#: ../../quickstart-front.rst:393
 msgid "Changing actions or sublinks"
 msgstr "Изменение действий или подссылок"
 
-#: ../../quickstart-front.rst:405
+#: ../../quickstart-front.rst:395
 msgid ""
 "Sometimes using only schema for defining actions or sublinks is not "
 "enough."
 msgstr ""
-"Иногда использование только схемы для определения действий или подссылок недостаточно."
+"Иногда использование только схемы для определения действий или подссылок "
+"недостаточно."
 
-#: ../../quickstart-front.rst:407
+#: ../../quickstart-front.rst:397
 msgid ""
 "For example we have an action to make user a superuser "
 "(`/user/{id}/make_superuser/`) and we want to hide that action if user is"
 " already a superuser (`is_superuser` is `true`). `<${PATH}>filterActions`"
 " signal can be used to achieve such result."
 msgstr ""
-"Например, у нас есть действие, которое делает пользователя суперпользователем "
-"(`/user/{id}/make_superuser/`), и мы хотим скрыть это действие, если пользователь уже "
-"является суперпользователем (`is_superuser` равно `true`). Сигнал `<${PATH}>filterActions` "
-"может быть использован для достижения такого результата."
+"Например, у нас есть действие, которое делает пользователя "
+"суперпользователем (`/user/{id}/make_superuser/`), и мы хотим скрыть это "
+"действие, если пользователь уже является суперпользователем "
+"(`is_superuser` равно `true`). Сигнал `<${PATH}>filterActions` может быть"
+" использован для достижения такого результата."
 
-#: ../../quickstart-front.rst:419
+#: ../../quickstart-front.rst:409
 msgid "`<${PATH}>filterActions` recieves {actions, data}"
 msgstr "`<${PATH}>filterActions` получает {actions, data}"
 
-#: ../../quickstart-front.rst:420
+#: ../../quickstart-front.rst:410
 msgid "`<${PATH}>filterSublinks` recieves {sublinks, data}"
 msgstr "`<${PATH}>filterSublinks` получает {sublinks, data}"
 
-#: ../../quickstart-front.rst:422
+#: ../../quickstart-front.rst:412
 msgid ""
 "Data property will contain instance's data. Actions and sublinks "
 "properties will contain arrays with default items (not hidden action or "
 "sublinks), it can be changed or replaced completely."
 msgstr ""
-"Свойство `data` будет содержать данные экземпляра. Свойства `actions` и `sublinks` "
-"будут содержать массивы с элементами по умолчанию (не скрытыми действиями или "
-"подссылками), их можно изменить или полностью заменить."
+"Свойство `data` будет содержать данные экземпляра. Свойства `actions` и "
+"`sublinks` будут содержать массивы с элементами по умолчанию (не скрытыми"
+" действиями или подссылками), их можно изменить или полностью заменить."
 
-#: ../../quickstart-front.rst:428
+#: ../../quickstart-front.rst:418
 msgid "LocalSettings"
 msgstr "Локальные настройки"
 
-#: ../../quickstart-front.rst:430
+#: ../../quickstart-front.rst:420
 msgid ""
 "This model's fields are displayed in the left sidebar. All data from this"
 " model saves in browser Local Storage. If you want to add another "
 "options, you can do it using `beforeInit` signal, for example:"
 msgstr ""
 "Поля этой модели отображаются в левой боковой панели. Все данные из этой "
-"модели сохраняются в локальном хранилище браузера. Если вы хотите добавить другие "
-"варианты, вы можете сделать это, используя сигнал `beforeInit`, например:"
+"модели сохраняются в локальном хранилище браузера. Если вы хотите "
+"добавить другие варианты, вы можете сделать это, используя сигнал "
+"`beforeInit`, например:"
 
-#: ../../quickstart-front.rst:444
+#: ../../quickstart-front.rst:434
 msgid "Store"
 msgstr "Хранилище"
 
-#: ../../quickstart-front.rst:446
+#: ../../quickstart-front.rst:436
 msgid "There are three ways to store data:"
 msgstr "Есть три способа сохранения данных:"
 
-#: ../../quickstart-front.rst:448
+#: ../../quickstart-front.rst:438
 msgid ""
 "userSettingsStore - saves data on the server. By default, there are "
 "options for changing language and a button to turn on/off the dark mode. "
@@ -561,55 +568,59 @@ msgstr ""
 "варианты изменения языка и кнопка включения/выключения темного режима. "
 "Данные для userSettingsStore поступают из схемы."
 
-#: ../../quickstart-front.rst:450
+#: ../../quickstart-front.rst:440
 msgid ""
 "localSettingsStore - saves data in the browser Local Storage. This is "
 "where you can store your own fields, as described in "
 ":ref:`localSettings`."
 msgstr ""
-"localSettingsStore - сохраняет данные в локальном хранилище браузера. Здесь вы можете "
-"хранить свои собственные поля, как описано в :ref:`localSettings`."
+"localSettingsStore - сохраняет данные в локальном хранилище браузера. "
+"Здесь вы можете хранить свои собственные поля, как описано в "
+":ref:`localSettings`."
 
-#: ../../quickstart-front.rst:451
+#: ../../quickstart-front.rst:441
 msgid "store - stores current page data."
 msgstr "store - хранит данные текущей страницы."
 
-#: ../../quickstart-front.rst:453
+#: ../../quickstart-front.rst:443
 msgid ""
 "To use any of this stores you need to run the following command: "
 ":code:`app.[storeName]`, for example: :code:`app.userSettingsStore`."
 msgstr ""
-"Чтобы использовать любое из этих хранилищ, вам нужно выполнить следующую команду: "
-":code:`app.[storeName]`, например: :code:`app.userSettingsStore`."
+"Чтобы использовать любое из этих хранилищ, вам нужно выполнить следующую "
+"команду: :code:`app.[storeName]`, например: "
+":code:`app.userSettingsStore`."
 
-#: ../../quickstart-front.rst:455
+#: ../../quickstart-front.rst:445
 msgid ""
 "If you are accessing the userSettingsStore from within the component then"
 " you need to use :code:`this.$app` instead :code:`app`."
 msgstr ""
-"Если вы обращаетесь к userSettingsStore изнутри компонента, тогда "
-"вам нужно использовать :code:`this.$app` вместо :code:`app`."
+"Если вы обращаетесь к userSettingsStore изнутри компонента, тогда вам "
+"нужно использовать :code:`this.$app` вместо :code:`app`."
 
-#: ../../quickstart-front.rst:457
+#: ../../quickstart-front.rst:447
 msgid "From `app.store` you may need:"
 msgstr "Из `app.store` вам может потребоваться:"
 
-#: ../../quickstart-front.rst:459
+#: ../../quickstart-front.rst:449
 msgid ""
 "`vewsItems` and `viewItemsMap` - stores information about parent views "
 "for this page. It is used for example in breadcrumbs. The difference "
 "between them is only in the way information is stored: `viewItems` is an "
 "Array of Objects and `viewItemsMap` is a Map."
 msgstr ""
-"`vewsItems` и `viewItemsMap` - хранят информацию о родительских представлениях "
-"для этой страницы. Они используются, например, в хлебных крошках. Различие "
-"между ними заключается только в способе хранения информации: `viewItems` - это "
-"массив объектов, а `viewItemsMap` - это карта."
+"`vewsItems` и `viewItemsMap` - хранят информацию о родительских "
+"представлениях для этой страницы. Они используются, например, в хлебных "
+"крошках. Различие между ними заключается только в способе хранения "
+"информации: `viewItems` - это массив объектов, а `viewItemsMap` - это "
+"карта."
 
-#: ../../quickstart-front.rst:461
+#: ../../quickstart-front.rst:451
 msgid "`page` - saves all information about current page."
 msgstr "`page` - сохраняет всю информацию о текущей странице."
 
-#: ../../quickstart-front.rst:462
+#: ../../quickstart-front.rst:452
 msgid "`title` - title of current page."
 msgstr "`title` - заголовок текущей страницы."
+
diff --git a/doc/quickstart-front.rst b/doc/quickstart-front.rst
index 2886ee07..2ebe18e3 100644
--- a/doc/quickstart-front.rst
+++ b/doc/quickstart-front.rst
@@ -69,21 +69,37 @@ There is a flowchart representing application initialization process (signal nam
 
     classDef classSignal stroke:#333,color:#f00;
 
-.. _field-section:
 
-Field customization
--------------------
-To add custom script to the project, set script name in settings.py
+.. _frontend_customization:
 
-.. sourcecode:: python
+Frontend customization
+----------------------
+To use custom frontend in you project rename `vite.config.ts.default` to `vite.config.ts`.
+Every project based on vst-utils contains `index.ts` in `/frontend_src/` directory.
+This file is intended for your code. Run `yarn` command to install all dependencies. Then run `yarn devBuild`
+from root dir of your project to build static files.
+
+Output files will be built into `{AppName}/static/spa` directory. During vstutils installation through `pip`
+frontend code are being build automatically, so you may need to add `spa` directory to `.gitignore`.
+
+Example of simple frontend entrypoint:
 
-    SPA_STATIC += [
-        {'priority': 101, 'type': 'js', 'name': 'main.js', 'source': 'project_lib'},
-    ]
+.. sourcecode:: typescript
+
+    import { initApp } from '@vstconsulting/vstutils';
+
+    initApp({
+      api: {
+        url: new URL('/api/', window.location.origin).toString(),
+      },
+    });
 
 
-and put the script (`main.js`) in `{appName}/static/` directory.
 
+.. _field-section:
+
+Field customization
+-------------------
 1. In `main.js` create new field by extending it from BaseField (or any other appropriate field)
 
     For example lets create a field that renders HTML h1 element with 'Hello World!` text:
@@ -178,14 +194,18 @@ useful to get different set of authors (that may have been previously filtered o
 CSS Styling
 -----------
 
-1. Like scripts, css files may be added to SPA_STATIC in setting.py
+1. Like scripts, css files may be added to `index.ts`
 
-.. sourcecode:: python
+.. sourcecode:: typescript
 
-    SPA_STATIC += [
+    import { initApp } from '@vstconsulting/vstutils';
+    import './style.css';
 
-        {'priority': 101, 'type': 'css', 'name': 'style.css', 'source': 'project_lib'},
-    ]
+    initApp({
+      api: {
+        url: new URL('/api/', window.location.origin).toString(),
+      },
+    });
 
 
 
@@ -289,36 +309,6 @@ To change title and string displayed in the breadcrumbs change `title` property
     });
 
 
-Basic Webpack configuration
----------------------------
-To use webpack in you project rename `webpack.config.js.default` to `webpack.config.js`.
-Every project based on vst-utils contains `index.js` in `/frontend_src/app/` directory.
-This file is intended for your code. Run `yarn` command to install all dependencies. Then run `yarn devBuild`
-from root dir of your project to build static files. Final step is to add built file to `SPA_STATIC` in `settings.py`
-
-.. sourcecode:: python
-
-    SPA_STATIC += [
-        {'priority': 101, 'type': 'js', 'name': '{AppName}/bundle/app.js', 'source': 'project_lib'},
-    ]
-
-Webpack configuration file allows to add more static files. In `webpack.config.js` add more entries
-
-.. sourcecode:: javascript
-
-    const config = {
-      mode: setMode(),
-      entry: {
-        'app': entrypoints_dir + "/app/index.js" // default,
-        'myapp': entrypoints_dir + "/app/myapp.js" // just added
-      },
-
-Output files will be built into `frontend_src/{AppName}/static/{AppName}/bundle` directory. Name of output file
-corresponds to name of entry in `config`. In the example above output files will have names `app.js` and `myapp.js`.
-Add all of these files to `STATIC_SPA` in `settings.py`. During vstutils installation trough `pip`
-frontend code are being build automatically, so you may need to add `bundle` directory to `gitignore`.
-
-
 Page store
 ----------
 Every page has store that can be accessed globally `app.store.page` or from page component using `this.store`.
diff --git a/frontend_src/README.md b/frontend_src/README.md
index cfd36a31..3db89fc2 100644
--- a/frontend_src/README.md
+++ b/frontend_src/README.md
@@ -7,7 +7,7 @@ the ability to generate documentation for the API based on the schema.
 By default GUI based on AdminLTE dashboard and Vue templates.
 
 Review a special section in the documentation for a QuickStart
-development - <https://vstutils.vstconsulting.net/quickstart.html>.
+development - <https://vstutils.vstconsulting.net/en/latest/quickstart-front.html#frontend-customization>.
 
 [![License](https://img.shields.io/github/license/vstconsulting/vstutils.svg)](https://github.com/vstconsulting/vstutils/blob/master/LICENSE)
 
@@ -15,7 +15,7 @@ development - <https://vstutils.vstconsulting.net/quickstart.html>.
 
 ![NPM - Downloads](https://img.shields.io/npm/dm/%40vstconsulting%2Fvstutils)
 
-[![Documentation Status](https://readthedocs.org/projects/vstutils/badge/?version=latest)](https://vstutils.vstconsulting.net/en/latest/?badge=latest)
+[![Documentation Status](https://readthedocs.org/projects/vstutils/badge/?version=latest)](https://vstutils.vstconsulting.net/en/latest/quickstart-front.html#frontend-customization?badge=latest)
 
 ## Development Status
 

From 1b8cca88e357a0c7646476ea11cc704a0c5a8e6a Mon Sep 17 00:00:00 2001
From: Dmitriy Ovcharenko <ovcharenkodd@gmail.com>
Date: Tue, 30 Jul 2024 01:05:48 +1000
Subject: [PATCH 37/46] Chore(frontend): Split frontend by adding some dynamic
 imports.

---
 frontend_src/app.common.js                    | 10 +--
 frontend_src/libs/jquery.js                   |  2 +-
 frontend_src/spa/vite.config.ts               |  6 ++
 .../__tests__/fk-on-sibling-of-parent.test.ts | 78 +++++++++++++++++++
 frontend_src/vstutils/app.ts                  | 32 +++++---
 .../autoupdate/ComponentWithAutoUpdate.ts     |  3 +-
 .../vstutils/autoupdate/useAutoUpdate.ts      |  4 +-
 .../components/items/sidebar/Sidebar.vue      |  2 +-
 .../fields/barcode/Barcode128Field.ts         |  7 +-
 .../barcode/BarcodeFieldContentEdit.vue       |  7 +-
 .../vstutils/fields/barcode/QRCodeField.ts    |  7 +-
 .../barcode/__tests__/barcode-fields.test.ts  |  8 +-
 .../files/csv-file/CSVFileFieldEdit.vue       |  5 +-
 .../files/csv-file/CsvFileFieldReadonly.vue   |  5 +-
 .../ResolutionValidatorImage.vue              |  1 +
 .../ResolutionValidatorModal.vue              |  5 +-
 .../fk/deep-fk/DeepFKFieldContentEditable.vue |  4 +-
 .../fk/deep-fk/DeepFkArrayFieldEdit.vue       |  4 +-
 frontend_src/vstutils/schema.ts               |  1 +
 .../vstutils/store/userSettingsStore.ts       |  4 +-
 .../vstutils/views/ViewConstructor.js         | 14 +++-
 vstutils/__init__.py                          |  2 +-
 22 files changed, 161 insertions(+), 50 deletions(-)
 create mode 100644 frontend_src/vstutils/__tests__/fk-on-sibling-of-parent.test.ts

diff --git a/frontend_src/app.common.js b/frontend_src/app.common.js
index 61a92db8..ba036047 100644
--- a/frontend_src/app.common.js
+++ b/frontend_src/app.common.js
@@ -13,12 +13,11 @@ import 'jquery.scrollto';
 
 import 'jquery-slimscroll';
 
-import 'jquery-touchswipe/jquery.touchSwipe.js';
+import('jquery-touchswipe/jquery.touchSwipe.js');
 
 import './libs/vue.js';
 
-import { register } from 'swiper/element/bundle';
-register();
+import('swiper/element/bundle').then(({ register }) => register());
 
 import moment from 'moment-timezone';
 window.moment = moment;
@@ -29,11 +28,6 @@ window.md5 = md5;
 import Visibility from 'visibilityjs';
 window.Visibility = Visibility;
 
-import IMask from 'imask';
-window.IMask = IMask;
-
-import 'cropperjs/dist/cropper.css';
-
 import iziToast from 'izitoast';
 import 'izitoast/dist/css/iziToast.css';
 window.iziToast = iziToast;
diff --git a/frontend_src/libs/jquery.js b/frontend_src/libs/jquery.js
index 071ed67c..3bd2eeae 100644
--- a/frontend_src/libs/jquery.js
+++ b/frontend_src/libs/jquery.js
@@ -1,5 +1,5 @@
 import jQuery from 'jquery';
-import select2 from 'select2';
+import select2 from 'select2/dist/js/select2.full.min.js';
 
 let $ = jQuery;
 if (typeof jQuery.default === 'function') {
diff --git a/frontend_src/spa/vite.config.ts b/frontend_src/spa/vite.config.ts
index 248d26a3..ccdcd5ce 100644
--- a/frontend_src/spa/vite.config.ts
+++ b/frontend_src/spa/vite.config.ts
@@ -20,6 +20,12 @@ export default defineConfig(({ mode }) => {
             minify: !isDev,
             outDir: join(frontendSrc, '..', 'vstutils', 'static', 'spa'),
             emptyOutDir: true,
+            resolve: {
+                alias: {
+                    'moment-timezone':
+                        'moment-timezone/builds/moment-timezone-with-data-10-year-range.min.js',
+                },
+            },
         },
     };
 });
diff --git a/frontend_src/vstutils/__tests__/fk-on-sibling-of-parent.test.ts b/frontend_src/vstutils/__tests__/fk-on-sibling-of-parent.test.ts
new file mode 100644
index 00000000..0cdbeb27
--- /dev/null
+++ b/frontend_src/vstutils/__tests__/fk-on-sibling-of-parent.test.ts
@@ -0,0 +1,78 @@
+import { createSchema, createApp, schemaListOf } from '#unittests';
+
+test('Foreign key on sibling of parent', async () => {
+    await createApp({
+        schema: createSchema({
+            definitions: {
+                Fk: {
+                    type: 'object',
+                    properties: {
+                        id: { type: 'integer' },
+                        name: { type: 'string' },
+                    },
+                },
+                WithFk: {
+                    type: 'object',
+                    properties: {
+                        id: { type: 'integer' },
+                        fk: {
+                            type: 'integer',
+                            format: 'fk',
+                            'x-options': {
+                                model: { $ref: '#/definitions/Fk' },
+                            },
+                        },
+                    },
+                },
+            },
+            paths: {
+                '/some_1/{some_1_id}/fk/': {
+                    parameters: [{ name: 'some_1_id', in: 'path', required: true, type: 'integer' }],
+                    get: {
+                        operationId: 'fks',
+                        'x-list': true,
+                        responses: {
+                            200: {
+                                description: 'List of fk',
+                                schema: schemaListOf({ $ref: '#/definitions/Fk' }),
+                            },
+                        },
+                    },
+                },
+                '/some_1/{some_1_id}/some_2/{some_2_id}/some_3/{some_3_id}/with_fk/': {
+                    parameters: [
+                        { name: 'some_1_id', in: 'path', required: true, type: 'integer' },
+                        { name: 'some_2_id', in: 'path', required: true, type: 'integer' },
+                        { name: 'some_3_id', in: 'path', required: true, type: 'integer' },
+                    ],
+                    get: {
+                        operationId: 'with_fk_list',
+                        responses: {
+                            200: {
+                                description: 'List of with_fk',
+                                schema: schemaListOf({ $ref: '#/definitions/WithFk' }),
+                            },
+                        },
+                    },
+                },
+                '/some_1/{some_1_id}/some_2/{some_2_id}/some_3/{some_3_id}/with_fk/{with_fk_id}/': {
+                    parameters: [
+                        { name: 'some_1_id', in: 'path', required: true, type: 'integer' },
+                        { name: 'some_2_id', in: 'path', required: true, type: 'integer' },
+                        { name: 'some_3_id', in: 'path', required: true, type: 'integer' },
+                        { name: 'with_fk_id', in: 'path', required: true, type: 'integer' },
+                    ],
+                    get: {
+                        operationId: 'with_fk_get',
+                        responses: {
+                            200: {
+                                description: 'WithFk',
+                                schema: { $ref: '#/definitions/WithFk' },
+                            },
+                        },
+                    },
+                },
+            },
+        }),
+    });
+});
diff --git a/frontend_src/vstutils/app.ts b/frontend_src/vstutils/app.ts
index 4260edb2..52f91a22 100644
--- a/frontend_src/vstutils/app.ts
+++ b/frontend_src/vstutils/app.ts
@@ -2,7 +2,7 @@ import type { ComponentOptions } from 'vue';
 import type VueRouter from 'vue-router';
 import Vue from 'vue';
 
-import { Centrifuge } from 'centrifuge';
+import type { Centrifuge as CentrifugeBase } from 'centrifuge';
 import { defineStore } from 'pinia';
 import type { CustomVueI18n } from './translation';
 
@@ -41,11 +41,21 @@ import type { UserProfile, InitAppConfig } from './init-app';
 
 import type { GlobalStoreInitialized } from '#vstutils/store/globalStore';
 
-export function getCentrifugoClient(address?: string, token?: string) {
+export interface Centrifuge extends CentrifugeBase {
+    isConnected: boolean;
+}
+
+export async function getCentrifugoClient(address?: string, token?: string): Promise<Centrifuge | undefined> {
     if (!address) {
-        return null;
+        return;
     }
-    const client = new Centrifuge(address);
+    const { Centrifuge, State } = await import('centrifuge');
+    class CentrifugoClient extends Centrifuge {
+        get isConnected() {
+            return this.state === State.Connected;
+        }
+    }
+    const client = new CentrifugoClient(address);
     if (token) {
         client.setToken(token);
     }
@@ -71,7 +81,7 @@ export interface IApp {
     viewsTree: ViewsTree | null;
     global_components: ComponentsRegistrator;
 
-    centrifugoClient: Centrifuge | null;
+    centrifugoClient?: Centrifuge;
 
     router: VueRouter | null;
     i18n: CustomVueI18n;
@@ -141,7 +151,8 @@ export class App implements IApp {
     viewsTree: ViewsTree | null = null;
     global_components: ComponentsRegistrator;
 
-    centrifugoClient: Centrifuge | null;
+    centrifugoClientPromise: Promise<Centrifuge | undefined>;
+    centrifugoClient?: Centrifuge;
 
     router: VueRouter | null;
     i18n: CustomVueI18n;
@@ -189,7 +200,7 @@ export class App implements IApp {
 
         this.translationsManager = new TranslationsManager(config);
 
-        this.centrifugoClient = getCentrifugoClient(
+        this.centrifugoClientPromise = getCentrifugoClient(
             this.schema.info['x-centrifugo-address'],
             this.schema.info['x-centrifugo-token'],
         );
@@ -244,8 +255,11 @@ export class App implements IApp {
 
     async start() {
         await this.api.initialized();
-        if (this.centrifugoClient) {
-            this.centrifugoClient.connect();
+        if (this.centrifugoClientPromise) {
+            this.centrifugoClient = await this.centrifugoClientPromise;
+            if (this.centrifugoClient) {
+                this.centrifugoClient.connect();
+            }
         }
 
         let userSettingsModel: ModelConstructor;
diff --git a/frontend_src/vstutils/autoupdate/ComponentWithAutoUpdate.ts b/frontend_src/vstutils/autoupdate/ComponentWithAutoUpdate.ts
index ea14625c..f1967d96 100644
--- a/frontend_src/vstutils/autoupdate/ComponentWithAutoUpdate.ts
+++ b/frontend_src/vstutils/autoupdate/ComponentWithAutoUpdate.ts
@@ -2,7 +2,6 @@ import { defineComponent } from 'vue';
 import type { CentrifugoAutoUpdateAction, TimerAutoUpdateAction } from './AutoUpdateController';
 import type { BaseView } from './../views';
 import ComponentIDMixin from '../ComponentIDMixin.js';
-import { State } from 'centrifuge';
 
 export default defineComponent({
     mixins: [ComponentIDMixin],
@@ -17,7 +16,7 @@ export default defineComponent({
             return (this.view as BaseView | null)?.subscriptionLabels;
         },
         autoupdateTriggerType() {
-            if (this.$app.centrifugoClient?.state === State.Connected && this.autoupdateSubscriptionLabels) {
+            if (this.$app.centrifugoClient?.isConnected && this.autoupdateSubscriptionLabels) {
                 return 'centrifugo';
             }
             return 'timer';
diff --git a/frontend_src/vstutils/autoupdate/useAutoUpdate.ts b/frontend_src/vstutils/autoupdate/useAutoUpdate.ts
index 1cc44a41..da2132d1 100644
--- a/frontend_src/vstutils/autoupdate/useAutoUpdate.ts
+++ b/frontend_src/vstutils/autoupdate/useAutoUpdate.ts
@@ -1,6 +1,4 @@
 import { onBeforeUnmount, onMounted, getCurrentInstance, onScopeDispose } from 'vue';
-import { State } from 'centrifuge';
-
 import { getApp, getUniqueId } from '#vstutils/utils';
 import type {
     AutoUpdateAction,
@@ -26,7 +24,7 @@ export function useAutoUpdate({
     const id = getUniqueId();
 
     const autoUpdateAction: TimerAutoUpdateAction | Omit<CentrifugoAutoUpdateAction, 'pk'> =
-        app.centrifugoClient?.state === State.Connected && labels
+        app.centrifugoClient?.isConnected && labels
             ? {
                   id,
                   callback,
diff --git a/frontend_src/vstutils/components/items/sidebar/Sidebar.vue b/frontend_src/vstutils/components/items/sidebar/Sidebar.vue
index 407f2c49..aa19e11f 100644
--- a/frontend_src/vstutils/components/items/sidebar/Sidebar.vue
+++ b/frontend_src/vstutils/components/items/sidebar/Sidebar.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script setup lang="ts">
-    import * as $ from 'jquery';
+    import $ from 'jquery';
     import SidebarItem from './SidebarItem.vue';
     import type { MenuItem } from './utils';
     import { hideSidebar, openSidebar } from './utils';
diff --git a/frontend_src/vstutils/fields/barcode/Barcode128Field.ts b/frontend_src/vstutils/fields/barcode/Barcode128Field.ts
index 32caf13c..e7199f6f 100644
--- a/frontend_src/vstutils/fields/barcode/Barcode128Field.ts
+++ b/frontend_src/vstutils/fields/barcode/Barcode128Field.ts
@@ -1,14 +1,15 @@
-import { defineComponent, h, ref } from 'vue';
+import { defineAsyncComponent, defineComponent, h, ref } from 'vue';
 
 import type { FieldReadonlyPropsDefType } from '#vstutils/fields/base';
 import { BaseField, BaseFieldMixin, FieldReadonlyPropsDef } from '#vstutils/fields/base';
-import { Html5QrcodeSupportedFormats } from 'html5-qrcode';
+import { Html5QrcodeSupportedFormats } from 'html5-qrcode/esm/core';
 import type { BarcodeField, BarcodeFieldXOptions } from './base';
 import BarcodeFieldContentEdit from './BarcodeFieldContentEdit.vue';
 import FullScreenView from '#vstutils/components/FullScreenView.vue';
-import CanvasRenderer from './CanvasRenderer.vue';
 import { getApp } from '#vstutils/utils';
 
+const CanvasRenderer = defineAsyncComponent(() => import('./CanvasRenderer.vue'));
+
 const Barcode128FieldReadOnly = defineComponent({
     props: FieldReadonlyPropsDef as FieldReadonlyPropsDefType<Barcode128Field>,
 
diff --git a/frontend_src/vstutils/fields/barcode/BarcodeFieldContentEdit.vue b/frontend_src/vstutils/fields/barcode/BarcodeFieldContentEdit.vue
index 925aea6a..3e779504 100644
--- a/frontend_src/vstutils/fields/barcode/BarcodeFieldContentEdit.vue
+++ b/frontend_src/vstutils/fields/barcode/BarcodeFieldContentEdit.vue
@@ -59,14 +59,15 @@
 </template>
 
 <script setup lang="ts">
-    import { ref, computed } from 'vue';
+    import { ref, computed, defineAsyncComponent } from 'vue';
     import { getApp } from '#vstutils/utils';
     import type { FieldEditPropsDefType } from '#vstutils/fields/base';
     import { FieldEditPropsDef } from '#vstutils/fields/base';
     import type { BarcodeField } from './base';
-    import ScannerCamera from './ScannerCamera.vue';
     import { useWidthResizeObserver } from '#vstutils/composables';
 
+    const ScannerCamera = defineAsyncComponent(() => import('./ScannerCamera.vue'));
+
     const emit = defineEmits<{
         (e: 'set-value', value: string | null | undefined): void;
     }>();
@@ -79,7 +80,7 @@
     const isScanning = ref(scanImmediately);
     const scannerIsInitialized = ref(false);
     const isEditing = ref(false);
-    const scannerCameraEl = ref<InstanceType<typeof ScannerCamera>>();
+    const scannerCameraEl = ref<InstanceType<typeof import('./ScannerCamera.vue').default>>();
 
     const camera = computed(
         () => app.localSettingsStore.settings.scannerCamera as MediaDeviceInfo | undefined,
diff --git a/frontend_src/vstutils/fields/barcode/QRCodeField.ts b/frontend_src/vstutils/fields/barcode/QRCodeField.ts
index c66c0b4d..78d2a9f1 100644
--- a/frontend_src/vstutils/fields/barcode/QRCodeField.ts
+++ b/frontend_src/vstutils/fields/barcode/QRCodeField.ts
@@ -1,14 +1,15 @@
-import { defineComponent, h, ref } from 'vue';
+import { defineAsyncComponent, defineComponent, h, ref } from 'vue';
 
 import type { FieldReadonlyPropsDefType } from '#vstutils/fields/base';
 import { BaseField, BaseFieldMixin, FieldReadonlyPropsDef } from '#vstutils/fields/base';
-import { Html5QrcodeSupportedFormats } from 'html5-qrcode';
+import { Html5QrcodeSupportedFormats } from 'html5-qrcode/esm/core';
 import { getApp } from '#vstutils/utils';
 import type { BarcodeFieldXOptions, BarcodeField } from './base';
 import BarcodeFieldContentEdit from './BarcodeFieldContentEdit.vue';
-import CanvasRenderer from './CanvasRenderer.vue';
 import FullScreenView from '#vstutils/components/FullScreenView.vue';
 
+const CanvasRenderer = defineAsyncComponent(() => import('./CanvasRenderer.vue'));
+
 const QRFieldReadOnly = defineComponent({
     props: FieldReadonlyPropsDef as FieldReadonlyPropsDefType<QRCodeField>,
 
diff --git a/frontend_src/vstutils/fields/barcode/__tests__/barcode-fields.test.ts b/frontend_src/vstutils/fields/barcode/__tests__/barcode-fields.test.ts
index a0bc6098..3234a851 100644
--- a/frontend_src/vstutils/fields/barcode/__tests__/barcode-fields.test.ts
+++ b/frontend_src/vstutils/fields/barcode/__tests__/barcode-fields.test.ts
@@ -3,7 +3,7 @@ import schema from './fields-schema.json';
 import type { BaseModel } from '#vstutils/models';
 import { QRCodeField } from '../QRCodeField';
 import { Barcode128Field } from '../Barcode128Field';
-import { fireEvent } from '@testing-library/dom';
+import { fireEvent, waitFor } from '@testing-library/dom';
 import { nextTick } from 'vue';
 import { fitToWrapper } from '#vstutils/utils';
 
@@ -184,8 +184,10 @@ describe('Barcode fields', () => {
         expect(fetchMock).toBeCalledTimes(1);
 
         // check qrcode's canvas rendered
-        const qrCodeCanvas = document.querySelector('.field-component.name-qrcode canvas');
-        expect(qrCodeCanvas).toBeTruthy();
+        await waitFor(() => {
+            const qrCodeCanvas = document.querySelector('.field-component.name-qrcode canvas');
+            expect(qrCodeCanvas).toBeTruthy();
+        });
 
         // check barcode128's canvas rendered
         const barcode128Canvas = document.querySelector('.field-component.name-barcode128 canvas');
diff --git a/frontend_src/vstutils/fields/files/csv-file/CSVFileFieldEdit.vue b/frontend_src/vstutils/fields/files/csv-file/CSVFileFieldEdit.vue
index 4f9958c1..a0b891af 100644
--- a/frontend_src/vstutils/fields/files/csv-file/CSVFileFieldEdit.vue
+++ b/frontend_src/vstutils/fields/files/csv-file/CSVFileFieldEdit.vue
@@ -28,18 +28,19 @@
     </div>
 </template>
 <script setup lang="ts">
-    import { computed, ref } from 'vue';
+    import { computed, defineAsyncComponent, ref } from 'vue';
 
     import { i18n } from '#vstutils/translation';
     import { readFileAsText } from '#vstutils/utils';
     import { FieldEditPropsDef } from '#vstutils/fields/base';
     import ConfirmModal from '#vstutils/components/common/ConfirmModal.vue';
-    import DataTable from './DataTable.vue';
     import FileFieldSelector from '../FileFieldSelector.vue';
 
     import type { ExtractRepresent, FieldEditPropsDefType } from '#vstutils/fields/base';
     import type { CsvFileField } from './index';
 
+    const DataTable = defineAsyncComponent(() => import('./DataTable.vue'));
+
     const props = defineProps(FieldEditPropsDef as FieldEditPropsDefType<CsvFileField>);
 
     const emit = defineEmits<{
diff --git a/frontend_src/vstutils/fields/files/csv-file/CsvFileFieldReadonly.vue b/frontend_src/vstutils/fields/files/csv-file/CsvFileFieldReadonly.vue
index 7f3be3d6..6e48c31c 100644
--- a/frontend_src/vstutils/fields/files/csv-file/CsvFileFieldReadonly.vue
+++ b/frontend_src/vstutils/fields/files/csv-file/CsvFileFieldReadonly.vue
@@ -14,12 +14,13 @@
 </template>
 
 <script setup lang="ts">
-    import { computed, ref } from 'vue';
-    import DataTable from './DataTable.vue';
+    import { computed, defineAsyncComponent, ref } from 'vue';
 
     import type { ExtractRepresent } from '#vstutils/fields/base';
     import type { CsvFileField } from './index';
 
+    const DataTable = defineAsyncComponent(() => import('./DataTable.vue'));
+
     const props = defineProps<{
         field: CsvFileField;
         value: ExtractRepresent<CsvFileField> | null | undefined;
diff --git a/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorImage.vue b/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorImage.vue
index 79ed12a0..e8478598 100644
--- a/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorImage.vue
+++ b/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorImage.vue
@@ -77,6 +77,7 @@
     import type ResolutionValidatorConfig from './ResolutionValidatorConfig';
     import type { IImageField } from './NamedBinaryImageField';
     import Cropper from 'cropperjs';
+    import 'cropperjs/dist/cropper.css';
     import Compressor from 'compressorjs';
 
     const allowedExtensions = ['jpeg', 'png', 'webp'];
diff --git a/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorModal.vue b/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorModal.vue
index e8b54af4..fb84671e 100644
--- a/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorModal.vue
+++ b/frontend_src/vstutils/fields/files/named-binary-image/ResolutionValidatorModal.vue
@@ -17,12 +17,13 @@
 </template>
 
 <script setup lang="ts">
-    import { ref, computed, onMounted } from 'vue';
+    import { ref, computed, onMounted, defineAsyncComponent } from 'vue';
     import BootstrapModal from '#vstutils/components/BootstrapModal.vue';
-    import ResolutionValidatorImage from './ResolutionValidatorImage.vue';
     import type { NamedFile } from '#vstutils/fields/files/named-binary-file';
     import type { IImageField } from './NamedBinaryImageField';
 
+    const ResolutionValidatorImage = defineAsyncComponent(() => import('./ResolutionValidatorImage.vue'));
+
     const props = defineProps<{
         field: IImageField;
         images: NamedFile[];
diff --git a/frontend_src/vstutils/fields/fk/deep-fk/DeepFKFieldContentEditable.vue b/frontend_src/vstutils/fields/fk/deep-fk/DeepFKFieldContentEditable.vue
index 95a324af..6d102179 100644
--- a/frontend_src/vstutils/fields/fk/deep-fk/DeepFKFieldContentEditable.vue
+++ b/frontend_src/vstutils/fields/fk/deep-fk/DeepFKFieldContentEditable.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script setup lang="ts">
+    import { defineAsyncComponent } from 'vue';
     import {
         FieldEditPropsDef,
         FieldEditEmitsDef,
@@ -11,7 +12,8 @@
         type SetFieldValueParams,
     } from '#vstutils/fields/base';
     import type DeepFKField from './DeepFKField';
-    import FkTree from './FkTree.vue';
+
+    const FkTree = defineAsyncComponent(() => import('./FkTree.vue'));
 
     const props = defineProps(FieldEditPropsDef as FieldEditPropsDefType<DeepFKField>);
     const emit = defineEmits(FieldEditEmitsDef as FieldEditEmitsDefType<DeepFKField>);
diff --git a/frontend_src/vstutils/fields/fk/deep-fk/DeepFkArrayFieldEdit.vue b/frontend_src/vstutils/fields/fk/deep-fk/DeepFkArrayFieldEdit.vue
index b4abf6d8..6173fe2d 100644
--- a/frontend_src/vstutils/fields/fk/deep-fk/DeepFkArrayFieldEdit.vue
+++ b/frontend_src/vstutils/fields/fk/deep-fk/DeepFkArrayFieldEdit.vue
@@ -10,8 +10,10 @@
 </template>
 
 <script>
+    import { defineAsyncComponent } from 'vue';
     import { BaseFieldContentEdit } from '#vstutils/fields/base';
-    import FkTree from './FkTree.vue';
+
+    const FkTree = defineAsyncComponent(() => import('./FkTree.vue'));
 
     export default {
         components: { FkTree },
diff --git a/frontend_src/vstutils/schema.ts b/frontend_src/vstutils/schema.ts
index faf7685d..f808f128 100644
--- a/frontend_src/vstutils/schema.ts
+++ b/frontend_src/vstutils/schema.ts
@@ -66,6 +66,7 @@ export type ModelDefinition = swagger.Schema & {
 
 export interface Operation extends swagger.Operation {
     'x-hidden'?: boolean;
+    'x-list'?: boolean;
 }
 
 export type Path = swagger.Path & {
diff --git a/frontend_src/vstutils/store/userSettingsStore.ts b/frontend_src/vstutils/store/userSettingsStore.ts
index c0892da7..c9f02b0b 100644
--- a/frontend_src/vstutils/store/userSettingsStore.ts
+++ b/frontend_src/vstutils/store/userSettingsStore.ts
@@ -40,10 +40,12 @@ export const createUserSettingsStore = (api: ApiConnector, modelClass: ModelCons
             instance.value._validateAndSetData();
             const dataToSave = instance.value._getInnerData();
             try {
-                const { data } = await api.bulkQuery<InnerData<Settings>>({
+                const { data } = await api.makeRequest<InnerData<Settings>>({
                     method: HttpMethods.PUT,
                     path: USER_SETTINGS_PATH,
                     data: dataToSave,
+                    useBulk: true,
+                    auth: true,
                 });
                 setData(data);
             } finally {
diff --git a/frontend_src/vstutils/views/ViewConstructor.js b/frontend_src/vstutils/views/ViewConstructor.js
index 3b5d0625..3347e60d 100644
--- a/frontend_src/vstutils/views/ViewConstructor.js
+++ b/frontend_src/vstutils/views/ViewConstructor.js
@@ -38,6 +38,7 @@ const EDIT_STYLE_PROPERTY_NAME = 'x-edit-style';
 const ACTION_NAME = 'x-action-name';
 const IS_MULTI_ACTION_PROPERTY_NAME = 'x-multiaction';
 const OAUTH2_SECURITY_DEF_NAME = 'oauth2';
+const X_LIST = 'x-list';
 
 /**
  * Class used to create views objects from schema
@@ -71,16 +72,21 @@ export default class ViewConstructor {
      * @param {string} operationId  Operation_id value.
      * @param {string} path Key of path object, from OpenApi's path dict.
      * @param {string} method Http method
+     * @param {object} operationSchema
      */
-    getOperationOptions(operationId, path, method) {
+    getOperationOptions(operationId, path, method, operationSchema) {
         const opt = { operationId };
         let operationOptions =
             this.dictionary.schema_types[
                 Object.keys(this.dictionary.schema_types).find((suffix) => operationId.endsWith(suffix))
             ];
 
-        if (!operationOptions && method === HttpMethods.GET) {
-            operationOptions = this.dictionary.schema_types['_get'];
+        if (!operationOptions) {
+            if (operationSchema[X_LIST]) {
+                operationOptions = this.dictionary.schema_types['_list'];
+            } else if (method === HttpMethods.GET) {
+                operationOptions = this.dictionary.schema_types['_get'];
+            }
         }
 
         if (operationOptions) {
@@ -225,7 +231,7 @@ export default class ViewConstructor {
                     },
                     commonOptions,
                     operationSchema,
-                    this.getOperationOptions(operationId, path, httpMethod),
+                    this.getOperationOptions(operationId, path, httpMethod, operationSchema),
                 );
 
                 if (operationOptions['x-label']) operationOptions.title = operationOptions['x-label'];
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 475580c6..82bfee85 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b21'
+__version__: str = '5.10.0b22'

From 1061c94e6695a093660d78bcd653be5c29f948ec Mon Sep 17 00:00:00 2001
From: Alexander Vyaznikov <alexnder.vyaznikov@yandex.ru>
Date: Wed, 31 Jul 2024 12:30:40 +1000
Subject: [PATCH 38/46] Feature(backend): Added allow bulk argument to nested
 decorator.

---
 doc/locale/ru/LC_MESSAGES/backend.po       | 26 +++++++++++++---------
 package.json                               |  3 ++-
 test_src/test_proj/models/nested_models.py |  1 +
 vstutils/__init__.py                       |  2 +-
 vstutils/api/decorators.py                 |  9 ++++++--
 vstutils/api/decorators.pyi                |  1 +
 6 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/doc/locale/ru/LC_MESSAGES/backend.po b/doc/locale/ru/LC_MESSAGES/backend.po
index d0ae6289..a95e0a71 100644
--- a/doc/locale/ru/LC_MESSAGES/backend.po
+++ b/doc/locale/ru/LC_MESSAGES/backend.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VST Utils 5.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-10 19:41+0000\n"
+"POT-Creation-Date: 2024-07-30 08:17+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -544,7 +544,7 @@ msgstr ""
 "действий, которые работают без дополнительных параметров."
 
 #: of vstutils.api.base.FileResponseRetrieveMixin:3
-#: vstutils.api.decorators.nested_view:37
+#: vstutils.api.decorators.nested_view:39
 #: vstutils.api.fields.AutoCompletionField:28
 #: vstutils.api.fields.Barcode128Field:24
 #: vstutils.api.fields.CommaMultiSelect:20
@@ -3315,22 +3315,26 @@ msgid "Flag for allowing to append existed instances."
 msgstr "Флаг, разрешающий добавление существующих экземпляров."
 
 #: of vstutils.api.decorators.nested_view:21
+msgid "Flag for forbidding bulk queries in related manager add method."
+msgstr "Флаг, запрещающий выполнение bulk запросов в методе add связанного менеджера."
+
+#: of vstutils.api.decorators.nested_view:23
 msgid "Name of model-object attr which contains nested queryset."
 msgstr "Имя атрибута объекта модели, который содержит вложенный queryset."
 
-#: of vstutils.api.decorators.nested_view:24
+#: of vstutils.api.decorators.nested_view:26
 msgid "List of allowed methods to nested view endpoints."
 msgstr "Список разрешенных методов для endpoint'ов вложенных view."
 
-#: of vstutils.api.decorators.nested_view:26
+#: of vstutils.api.decorators.nested_view:28
 msgid "List of allowed subviews or actions to nested view endpoints."
 msgstr "Список разрешенных subviews или экшенов для endpoint'ов вложенных views."
 
-#: of vstutils.api.decorators.nested_view:28
+#: of vstutils.api.decorators.nested_view:30
 msgid "List of callable objects which returns filtered queryset of main."
 msgstr "Список вызываемых объектов, которые возвращают отфильтрованный queryset."
 
-#: of vstutils.api.decorators.nested_view:32
+#: of vstutils.api.decorators.nested_view:34
 msgid ""
 "Some view methods will not call for performance reasons. This also "
 "applies to some of the class attributes that are usually initialized in "
@@ -3343,23 +3347,23 @@ msgstr ""
 "вызван. Каждый viewset обернут вложенным классом с дополнительной "
 "логикой."
 
-#: of vstutils.api.decorators.nested_view:57
+#: of vstutils.api.decorators.nested_view:59
 msgid "This code generates api paths:"
 msgstr "Данный код генерирует пути api:"
 
-#: of vstutils.api.decorators.nested_view:59
+#: of vstutils.api.decorators.nested_view:61
 msgid "`/tasks/` - GET, POST"
 msgstr "`/tasks/` - GET, POST"
 
-#: of vstutils.api.decorators.nested_view:60
+#: of vstutils.api.decorators.nested_view:62
 msgid "`/tasks/{id}/` - GET, PUT, PATCH, DELETE"
 msgstr "`/tasks/{id}/` - GET, PUT, PATCH, DELETE"
 
-#: of vstutils.api.decorators.nested_view:61
+#: of vstutils.api.decorators.nested_view:63
 msgid "`/tasks/{id}/stages/` - GET, POST"
 msgstr "`/tasks/{id}/stages/` - GET, POST"
 
-#: of vstutils.api.decorators.nested_view:62
+#: of vstutils.api.decorators.nested_view:64
 msgid "`/tasks/{id}/stages/{stages_id}/` - GET, PUT, PATCH, DELETE"
 msgstr "`/tasks/{id}/stages/{stages_id}/` - GET, PUT, PATCH, DELETE"
 
diff --git a/package.json b/package.json
index 5647221d..fa30de64 100644
--- a/package.json
+++ b/package.json
@@ -114,5 +114,6 @@
     "vue-router": "^3.6.5",
     "vue-template-compiler": "^2.7.16",
     "vue-virtual-table": "^0.2.22"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
diff --git a/test_src/test_proj/models/nested_models.py b/test_src/test_proj/models/nested_models.py
index f40ae70e..579cc9fd 100644
--- a/test_src/test_proj/models/nested_models.py
+++ b/test_src/test_proj/models/nested_models.py
@@ -74,6 +74,7 @@ class Meta:
             'products': {
                 'allow_append': True,
                 'model': Product,
+                'allow_bulk': False,
             },
             'manufacturers': {
                 'allow_append': False,
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 82bfee85..c630871f 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b22'
+__version__: str = '5.10.0b23'
diff --git a/vstutils/api/decorators.py b/vstutils/api/decorators.py
index 8791ea4b..7ac5d272 100644
--- a/vstutils/api/decorators.py
+++ b/vstutils/api/decorators.py
@@ -194,7 +194,7 @@ def perform_destroy(self, instance):
             # pylint: disable=import-outside-toplevel
             from vstutils.models import notify_clients
 
-            self.nested_manager.remove(instance)
+            self.nested_manager.remove(instance, **self.nested_manager_kwargs)
             notify_clients(instance.__class__, {'pk': instance.pk})
             notify_clients(self.nested_parent_object.__class__, {'pk': self.nested_parent_object.pk})
 
@@ -264,7 +264,7 @@ def _data_create(self, request_data, nested_append_arg):
             filter_arg: (i.get(nested_append_arg) for i in request_data)
         })
         self._check_permission_obj(objects)
-        self.nested_manager.add(*objects)
+        self.nested_manager.add(*objects, **self.nested_manager_kwargs)
         id_list = [o.pk for o in objects]
 
         label = objects.model._meta.label
@@ -341,6 +341,8 @@ class nested_view(BaseClassDecorator):  # pylint: disable=invalid-name
         vstutils.api.base.ReadOnlyModelViewSet
     :param allow_append: Flag for allowing to append existed instances.
     :type allow_append: bool
+    :param allow_bulk: Flag for forbidding bulk queries in related manager add method.
+    :type allow_bulk: bool
     :param manager_name: Name of model-object attr which contains nested queryset.
     :type manager_name: str,typing.Callable
     :param methods: List of allowed methods to nested view endpoints.
@@ -395,6 +397,7 @@ class TaskViewSet(ModelViewSet):
         'allow_append',
         'manager_name',
         'schema',
+        'allow_bulk',
     )
 
     filter_subs = ('filter',)
@@ -411,6 +414,7 @@ def __init__(self, name, arg=None, methods=None, *args, **kwargs):
         self.empty_arg = kwargs.pop('empty_arg', False)
         self.allow_append = bool(kwargs.pop('allow_append', False))
         self.manager_name = kwargs.pop('manager_name', name)
+        self.allow_bulk = kwargs.pop('allow_bulk', True)
 
         super().__init__(name, arg, *args, **kwargs)
 
@@ -507,6 +511,7 @@ def nested_view_function_wrapper(view_obj, request, *args, **kwargs):
             NestedView.nested_parent_object = nested_parent_object
             NestedView.nested_id = nested_id
             NestedView.nested_manager = nested_manager
+            NestedView.nested_manager_kwargs =  {} if self.allow_bulk else {'bulk': self.allow_bulk}
 
             getattr(view_obj, 'nested_allow_check', lambda *_, **__: None)()
             return nested_view_function(view_obj, NestedView, request, *args, **kwargs)
diff --git a/vstutils/api/decorators.pyi b/vstutils/api/decorators.pyi
index 7a343e96..9299ca61 100644
--- a/vstutils/api/decorators.pyi
+++ b/vstutils/api/decorators.pyi
@@ -151,6 +151,7 @@ class nested_view(BaseClassDecorator):
             subs: Optional[Iterable[str]] = None,
             append_arg: Optional[str] = None,
             empty_arg: bool = False,
+            allow_bulk: bool = True,
             *args,
             **kwargs
     ): ...

From 424f7ed8f3a8a2b4339f791845abbddedeae8a9d Mon Sep 17 00:00:00 2001
From: Julia Uschenko <julia.uschenko@gmail.com>
Date: Thu, 1 Aug 2024 14:36:20 +1000
Subject: [PATCH 39/46] Fix(backend): Provide translations to confirmation
 email and password reset email.

---
 test_src/test_proj/tests.py              | 19 +++++++++++++++++++
 vstutils/__init__.py                     |  2 +-
 vstutils/api/password_reset.py           |  1 +
 vstutils/api/registration/serializers.py |  7 ++++---
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index e885ddac..3df09832 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -1296,6 +1296,9 @@ def test_registration_with_email_confirmaion(self):
                 'email': 'test@user.test',
             },
             content_type='application/json',
+            headers={
+                'Accept-Language': 'ru,en-US;q=0.9,en;q=0.8,ru-RU;q=0.7,es;q=0.6',
+            },
         )
         self.assertEqual(response.status_code, 201)
         self.assertEqual(response.json(), {
@@ -1312,6 +1315,12 @@ def test_registration_with_email_confirmaion(self):
         content = str(msg.message())
         match = re.search(r'href="http://testserver/#/auth/registration/confirm-email/([\w\$]+)"', content)
         self.assertIsNotNone(match)
+        self.assertIn('Подтвердите свой аккаунт', content)
+        self.assertIn(f'Пожалуйста, подтвердите свой {self._settings("PROJECT_GUI_NAME")} аккаунт, проверив адрес электронной почты. Просто нажмите на ссылку ниже, и вы активируете свой аккаунт.', content)
+        self.assertIn('Если вы получили это письмо по ошибке, пожалуйста, удалите его.', content)
+        self.assertIn('Завершить регистрацию', content)
+        self.assertIn('Если у вас возникли проблемы с кнопкой выше, скопируйте и вставьте URL-адрес ниже в свой веб-браузер.', content)
+        self.assertEqual(msg.subject, 'Подтверждение Регистрации.')
 
         # Verify email
         with self.captureOnCommitCallbacks(execute=True):
@@ -1376,6 +1385,9 @@ def test_password_reset(self):
             '/api/oauth2/password_reset/',
             {'email': 'test_user@email.com'},
             content_type='application/json',
+            headers={
+                'Accept-Language': 'ru,en-US;q=0.9,en;q=0.8,ru-RU;q=0.7,es;q=0.6',
+            },
         )
         self.assertEqual(response.status_code, 201)
         self.assertEqual(response.json(), {})
@@ -1386,6 +1398,13 @@ def test_password_reset(self):
         self.assertIsNotNone(match)
         uid = match.group(1)
         token = match.group(2)
+        self.assertIn('Вы получили это письмо, потому что вы (или кто-то другой) запросили восстановление пароля от учётной записи на сайте Example Project, которая связана с этим адресом электронной почты.', content)
+        self.assertIn('Пожалуйста, перейдите на эту страницу и введите новый пароль:', content)
+        self.assertIn('Ваше имя пользователя (на случай, если вы его забыли):', content)
+        self.assertIn(user.username, content)
+        self.assertIn('Спасибо, что используете наш сайт!', content)
+        self.assertIn(f'Команда сайта {self._settings("PROJECT_GUI_NAME")}', content)
+        self.assertEqual(msg.subject, f'Сброс пароля на {self._settings("PROJECT_GUI_NAME")}')
 
         # Check invalid uid
         response = self.client_class().post(
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index c630871f..923fbce6 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b23'
+__version__: str = '5.10.0b24'
diff --git a/vstutils/api/password_reset.py b/vstutils/api/password_reset.py
index 9d18bf9d..47a6c479 100644
--- a/vstutils/api/password_reset.py
+++ b/vstutils/api/password_reset.py
@@ -65,6 +65,7 @@ def create(self, validated_data):
                     uid=urlsafe_b64encode(force_bytes(user.pk)).decode(),
                     token=default_token_generator.make_token(user),
                 ),
+                "__lang__": self.context["request"].language,
             }
             subject = loader.render_to_string(self.subject_template_name, context)
             # Email subject *must not* contain newlines
diff --git a/vstutils/api/registration/serializers.py b/vstutils/api/registration/serializers.py
index 6b0ee2e4..4eb837f4 100644
--- a/vstutils/api/registration/serializers.py
+++ b/vstutils/api/registration/serializers.py
@@ -8,7 +8,7 @@
 from rest_framework.exceptions import ValidationError
 from vstutils.api.fields import PasswordField
 from vstutils.api.serializers import VSTSerializer
-from vstutils.utils import lazy_translate as __
+from vstutils.utils import lazy_translate as __, translate as _
 from vstutils.utils import send_template_email
 
 from .utils import hash_data, secure_pickle
@@ -58,10 +58,11 @@ def get_confirmation_email_context(self, code: str):
         return {
             "action_url": self.build_confirmation_url(code),
             "application_name": settings.PROJECT_GUI_NAME,
-            "title": __("Confirm your account"),
-            "text": settings.EMAIL_CONFIRMATION_MESSAGE.format(
+            "title": _("Confirm your account"),
+            "text": _(settings.EMAIL_CONFIRMATION_MESSAGE).format(
                 application_name=settings.PROJECT_GUI_NAME
             ),
+            "__lang__": self.context["request"].language,
         }
 
     def send_confirmation_email(self, data: dict):

From 9b013df2df5d662613aee78002d19cd77239dee8 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Thu, 1 Aug 2024 00:13:52 -0700
Subject: [PATCH 40/46] Release 5.10.0b25

### Changelog:
* Fix(backend): Name collision in action prefixes.
* Fix(backend): An error in Centrifugo is blocking asynchronous requests.
---
 .gitlab-ci.yml                 |  5 +--
 vstutils/__init__.py           |  2 +-
 vstutils/api/schema/schema.py  |  4 +--
 vstutils/models/cent_notify.py | 56 ++++++++++++++++++----------------
 4 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2eec59a6..3c2a0edf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,8 +143,9 @@ release_packages:
     - twine upload -u ${PYPI_UPLOAD_NAME} -p ${PYPI_UPLOAD_PASSWORD} $(find dist/* -type f -name '*.tar.gz') $(find dist/* -type f -name '*.whl')
     # npm
     - |
-      VERSION=$(grep "__version__" vstutils/__init__.py | sed -E "s/__version__: str = '(.+)'/\1/")
+      VERSION=$(grep "__version__" vstutils/__init__.py | sed -E "s/__version__: str = '(.+)'/\1/" | sed -E "s/(a|b|rc|post)/-\1/")
       sed -i -E "s/\"version\": \"[^\"]+\"/\"version\": \"$VERSION\"/" package.json
+    - echo NPM_VERSION=$VERSION >> variables.env
     - yarn build-lib
     - cd dist
     - echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}'>.npmrc
@@ -176,5 +177,5 @@ release_job:
           url: "https://pypi.org/project/vstutils/${CI_COMMIT_TAG}/"
           link_type: 'other'
         - name: 'npm'
-          url: "https://www.npmjs.com/package/@vstconsulting/vstutils/v/${CI_COMMIT_TAG}"
+          url: "https://www.npmjs.com/package/@vstconsulting/vstutils/v/${NPM_VERSION}"
           link_type: 'other'
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 923fbce6..9c2fd0c0 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b24'
+__version__: str = '5.10.0b25'
diff --git a/vstutils/api/schema/schema.py b/vstutils/api/schema/schema.py
index f0a8abce..172d5177 100644
--- a/vstutils/api/schema/schema.py
+++ b/vstutils/api/schema/schema.py
@@ -56,8 +56,8 @@ def get_nested_view_obj(view, nested_view: 'View', view_action_func, method):
     # Get nested view recursively
     nested_view: 'View' = utils.get_if_lazy(_get_nested_view_class(nested_view, view_action_func))
     # Get action suffix
-    replace_pattern = view_action_func._nested_subname + '_'
-    replace_index = view.action.index(replace_pattern) + len(replace_pattern)
+    replace_pattern = view_action_func._nested_subname + '-'
+    replace_index = view_action_func.url_name.index(replace_pattern) + len(replace_pattern)
     action_suffix = view.action[replace_index:]
     # Check detail or list action
     is_detail = action_suffix.endswith('detail')
diff --git a/vstutils/models/cent_notify.py b/vstutils/models/cent_notify.py
index 33edb7b9..0cdfcba4 100644
--- a/vstutils/models/cent_notify.py
+++ b/vstutils/models/cent_notify.py
@@ -88,32 +88,36 @@ def send(self):
             return asyncio.run(self.asend())
 
     async def asend(self):
-        self.queue, objects = [], tuple(self.queue)
-
-        sent_channels = set()
-        provided_label = self.label
-
-        if objects and self.cent_client is None:
-            self.cent_client = self.get_client()
-            if not self.cent_client:
-                return
-
-        publish_requests: list[PublishRequest] = []
-
-        for obj_labels, data in objects:
-            with contextlib.suppress(Exception):
-                for obj_label in obj_labels:
-                    channel = self.get_subscription_channel(provided_label or obj_label)
-                    publish_requests.append(PublishRequest(
-                        channel=channel,
-                        data=data,
-                    ))
-                    sent_channels.add(channel)
-        if publish_requests:
-            logger.debug(f'Send notifications about {len(objects)} updates to channel(s) {sent_channels}.')
-            return await self.cent_client.batch(
-                BatchRequest(requests=publish_requests),
-            )
+        try:
+            self.queue, objects = [], tuple(self.queue)
+
+            sent_channels = set()
+            provided_label = self.label
+
+            if objects and self.cent_client is None:
+                self.cent_client = self.get_client()
+                if not self.cent_client:
+                    return
+
+            publish_requests: list[PublishRequest] = []
+
+            for obj_labels, data in objects:
+                with contextlib.suppress(Exception):
+                    for obj_label in obj_labels:
+                        channel = self.get_subscription_channel(provided_label or obj_label)
+                        publish_requests.append(PublishRequest(
+                            channel=channel,
+                            data=data,
+                        ))
+                        sent_channels.add(channel)
+            if publish_requests:
+                logger.debug(f'Send notifications about {len(objects)} updates to channel(s) {sent_channels}.')
+                return await self.cent_client.batch(
+                    BatchRequest(requests=publish_requests),
+                )
+        except Exception:  # nocv
+            # Hack for problems with async middleware
+            pass
 
     def disconnect_all(self):
         for signal in self._signals:

From 801ead89939c9b7c0ec7bdb1ef4afd862c39e614 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Thu, 1 Aug 2024 13:35:33 -0700
Subject: [PATCH 41/46] Release 5.10.0rc1

### Changelog:
* Fix(backend): Issue with integer min and max validators on DecimalField.
* Fix(backend): The ``output_field`` from ``GeneratedField`` wasnt being used for filtersets.
---
 .../migrations/0046_alter_product_price.py    | 19 +++++++++++++++++++
 test_src/test_proj/models/nested_models.py    |  3 ++-
 vstutils/__init__.py                          |  2 +-
 vstutils/api/serializers.py                   |  5 +++++
 vstutils/models/base.py                       |  6 ++++++
 5 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 test_src/test_proj/migrations/0046_alter_product_price.py

diff --git a/test_src/test_proj/migrations/0046_alter_product_price.py b/test_src/test_proj/migrations/0046_alter_product_price.py
new file mode 100644
index 00000000..5b78af78
--- /dev/null
+++ b/test_src/test_proj/migrations/0046_alter_product_price.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.0.7 on 2024-08-01 20:20
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('test_proj', '0045_dynamicfields_generated_field'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='product',
+            name='price',
+            field=models.DecimalField(decimal_places=2, max_digits=10, validators=[django.core.validators.MinValueValidator(0)]),
+        ),
+    ]
diff --git a/test_src/test_proj/models/nested_models.py b/test_src/test_proj/models/nested_models.py
index 579cc9fd..2fb14df5 100644
--- a/test_src/test_proj/models/nested_models.py
+++ b/test_src/test_proj/models/nested_models.py
@@ -1,4 +1,5 @@
 from django.db import models
+from django.core.validators import MinValueValidator
 from rest_framework.permissions import BasePermission
 
 from vstutils.models import BaseModel
@@ -30,7 +31,7 @@ class Meta:
 
 class Product(BaseModel):
     name = models.CharField(max_length=255)
-    price = models.DecimalField(max_digits=10, decimal_places=2)
+    price = models.DecimalField(max_digits=10, decimal_places=2, validators=[MinValueValidator(0)])
     store = models.ForeignKey('Store', on_delete=models.CASCADE)
     manufacturer = models.ForeignKey('Manufacturer', on_delete=models.CASCADE)
 
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 9c2fd0c0..a6bb2c03 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0b25'
+__version__: str = '5.10.0rc1'
diff --git a/vstutils/api/serializers.py b/vstutils/api/serializers.py
index 23979493..12599b85 100644
--- a/vstutils/api/serializers.py
+++ b/vstutils/api/serializers.py
@@ -5,6 +5,7 @@
 `Serializers <https://www.django-rest-framework.org/api-guide/serializers/>`_.
 """
 import copy
+from decimal import Decimal as D
 import typing as _t
 
 import orjson
@@ -191,6 +192,10 @@ def build_standard_field(self, field_name, model_field):
             if isinstance(model_field.default, str):
                 field_kwargs['default'] = orjson.loads(model_field.default) if model_field.default else drf_fields.empty
 
+        if issubclass(field_class, drf_fields.DecimalField):
+            for key in filter(field_kwargs.__contains__, ('min_value', 'max_value')):
+                field_kwargs[key] = D(str(field_kwargs[key]))
+
         return field_class, field_kwargs
 
     def build_relational_field(self, field_name, relation_info):
diff --git a/vstutils/models/base.py b/vstutils/models/base.py
index 9e8adefe..98ece356 100644
--- a/vstutils/models/base.py
+++ b/vstutils/models/base.py
@@ -11,6 +11,7 @@
 from django.core.cache.backends.base import DEFAULT_TIMEOUT as DEFAULT_CACHE_TIMEOUT
 from django.db.models.base import ModelBase
 from django.db.models import fields as django_model_fields
+from django.db.models.fields.generated import GeneratedField
 from django.db.models.fields.related import ManyToManyField, OneToOneField, ForeignKey
 from django.utils.functional import SimpleLazyObject, lazy
 from django.db.models.signals import post_save, post_delete
@@ -525,6 +526,11 @@ def iteration_filter_handler(field_object):
                     filterset_fields_types[field_name] = filters.ChoiceFilter(
                         choices=tuple(serializer.fields.get(field_name).choices.items())
                     )
+                elif isinstance(field, GeneratedField):
+                    if filter_settings := filterset.FILTER_FOR_DBFIELD_DEFAULTS.get(field.output_field.__class__):
+                        filterset_fields_types[field_name] = filter_settings['filter_class'](
+                            **filter_settings.get('extra', lambda _: {})(field.output_field)
+                        )
 
             return filterset.FilterSetMetaclass(
                 f'{cls.__name__}FilterSetClass',

From b6c15f71656c56f73432528115ac81da2bc32329 Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Mon, 5 Aug 2024 17:02:46 -0700
Subject: [PATCH 42/46] Chore(backend): Build ``vstutils.tools:get_file_value``
 with rust.

Note:
vstutils.tools get_file_value: 0.211951 seconds
vstutils._tools get_file_value: 0.044856 seconds
---
 .gitignore                |   1 +
 pyproject.toml            |   8 +-
 setup.py                  |   1 +
 vstutils/tools.py         |   7 +
 vstutils/tools.pyi        |   5 +
 vstutils_tools/Cargo.lock | 295 ++++++++++++++++++++++++++++++++++++++
 vstutils_tools/Cargo.toml |  14 ++
 vstutils_tools/src/lib.rs |  35 +++++
 8 files changed, 365 insertions(+), 1 deletion(-)
 create mode 100644 vstutils/tools.pyi
 create mode 100644 vstutils_tools/Cargo.lock
 create mode 100644 vstutils_tools/Cargo.toml
 create mode 100644 vstutils_tools/src/lib.rs

diff --git a/.gitignore b/.gitignore
index a9ade9d8..412ec701 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 node_modules
 vstutils/static/spa
 vstutils_utils/target
+vstutils_tools/target
 *.pyc
 *.c
 *.so
diff --git a/pyproject.toml b/pyproject.toml
index 5b9f0c62..75a915c3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=61.2", "vstcompile~=3.0", "cython~=3.0.10", "setuptools-rust~=1.9"]
+requires = ["setuptools>=61.2", "vstcompile~=3.0", "cython~=3.0.11", "setuptools-rust~=1.9"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -17,8 +17,10 @@ description = "VST Utils Framework for fast create web-application"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Web Environment",
+    "Framework :: Celery",
     "Framework :: Django",
     "Framework :: Django :: 5.0",
+    "Framework :: Pydantic :: 2",
     "Operating System :: POSIX",
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python",
@@ -29,12 +31,16 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Software Development :: Libraries",
+    "Topic :: Software Development :: User Interfaces",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
     "Topic :: Software Development :: Libraries :: Application Frameworks",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: User Interfaces",
     "Topic :: Utilities",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Information Technology",
+    "Typing :: Typed",
 ]
 requires-python = ">=3.10"
 dynamic = ["version", "dependencies", "optional-dependencies"]
diff --git a/setup.py b/setup.py
index ac02253d..0a3ff435 100644
--- a/setup.py
+++ b/setup.py
@@ -75,6 +75,7 @@
 if RustExtension is not None and os.path.exists("vstutils_utils/Cargo.toml") and os.environ.get('BUILD_OPTIMIZATION', 'false') == 'true':
     kwargs['rust_extensions'] = [
         RustExtension("vstutils._utils", path="vstutils_utils/Cargo.toml", binding=Binding.PyO3),
+        RustExtension("vstutils._tools", path="vstutils_tools/Cargo.toml", binding=Binding.PyO3),
     ]
 
 all_deps = []
diff --git a/vstutils/tools.py b/vstutils/tools.py
index 2c05ffd1..98b5bf82 100644
--- a/vstutils/tools.py
+++ b/vstutils/tools.py
@@ -33,3 +33,10 @@ def get_file_value(filename, default='', raise_error=False, strip=True):
             raise  # nocv
 
     return result
+
+
+try:
+    # pylint: disable=unused-import
+    from ._tools import get_file_value  # noqa: F811,F401
+except ImportError:  # nocv
+    pass
diff --git a/vstutils/tools.pyi b/vstutils/tools.pyi
new file mode 100644
index 00000000..a8eeaac2
--- /dev/null
+++ b/vstutils/tools.pyi
@@ -0,0 +1,5 @@
+def multikeysort(items: list[dict], columns: list[str], reverse: bool = False):
+    ...
+
+def get_file_value(filename: str, default: str = '', raise_error: bool = False, strip: bool = True):
+    ...
diff --git a/vstutils_tools/Cargo.lock b/vstutils_tools/Cargo.lock
new file mode 100644
index 00000000..63cc8df3
--- /dev/null
+++ b/vstutils_tools/Cargo.lock
@@ -0,0 +1,295 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "indoc"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "pyo3"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8"
+dependencies = [
+ "cfg-if",
+ "indoc",
+ "libc",
+ "memoffset",
+ "parking_lot",
+ "portable-atomic",
+ "pyo3-build-config",
+ "pyo3-ffi",
+ "pyo3-macros",
+ "unindent",
+]
+
+[[package]]
+name = "pyo3-build-config"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50"
+dependencies = [
+ "once_cell",
+ "target-lexicon",
+]
+
+[[package]]
+name = "pyo3-ffi"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403"
+dependencies = [
+ "libc",
+ "pyo3-build-config",
+]
+
+[[package]]
+name = "pyo3-macros"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c"
+dependencies = [
+ "proc-macro2",
+ "pyo3-macros-backend",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pyo3-macros-backend"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "pyo3-build-config",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "syn"
+version = "2.0.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unindent"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
+
+[[package]]
+name = "vstutils_tools"
+version = "0.1.0"
+dependencies = [
+ "pyo3",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
diff --git a/vstutils_tools/Cargo.toml b/vstutils_tools/Cargo.toml
new file mode 100644
index 00000000..180e541e
--- /dev/null
+++ b/vstutils_tools/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "vstutils_tools"
+version = "0.1.0"
+edition = "2018"
+
+[dependencies]
+pyo3 = { version = "0.21.2", features = ["extension-module", "abi3"] }
+
+[lib]
+crate-type = ["cdylib"]
+
+[profile.release]
+# Strip symbols to minimize size
+strip = true
diff --git a/vstutils_tools/src/lib.rs b/vstutils_tools/src/lib.rs
new file mode 100644
index 00000000..c6a1443f
--- /dev/null
+++ b/vstutils_tools/src/lib.rs
@@ -0,0 +1,35 @@
+use pyo3::prelude::*;
+use std::fs;
+use std::path::Path;
+
+#[pyfunction]
+fn get_file_value(filename: &str, default: Option<&str>, raise_error: Option<bool>, strip: Option<bool>) -> PyResult<String> {
+    let default = default.unwrap_or("");
+    let raise_error = raise_error.unwrap_or(false);
+    let strip = strip.unwrap_or(true);
+
+    let content = fs::read_to_string(Path::new(filename));
+
+    match content {
+        Ok(mut text) => {
+            if strip {
+                text = text.trim().to_string();
+            }
+            Ok(text)
+        }
+        Err(e) => {
+            if raise_error {
+                Err(PyErr::new::<pyo3::exceptions::PyIOError, _>(e.to_string()))
+            } else {
+                Ok(default.to_string())
+            }
+        }
+    }
+}
+
+/// A Python module implemented in Rust.
+#[pymodule]
+fn _tools(_py: Python, m: &PyModule) -> PyResult<()> {
+    m.add_function(wrap_pyfunction!(get_file_value, m)?)?;
+    Ok(())
+}

From ae69304a0512c3ac6db5ef8019d6eb5bcb7e507f Mon Sep 17 00:00:00 2001
From: Dmitriy <flwd3m@gmail.com>
Date: Mon, 5 Aug 2024 09:13:22 +0000
Subject: [PATCH 43/46] Fix(frontend): Clear old bulk caches

---
 frontend_src/vstutils/api/ApiConnector.ts |  2 +-
 frontend_src/vstutils/bulk.ts             | 31 +++++++++++++++++++----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/frontend_src/vstutils/api/ApiConnector.ts b/frontend_src/vstutils/api/ApiConnector.ts
index fe8d0901..95e01769 100644
--- a/frontend_src/vstutils/api/ApiConnector.ts
+++ b/frontend_src/vstutils/api/ApiConnector.ts
@@ -125,7 +125,7 @@ export class ApiConnector {
         this.defaultVersion = this.openapi.info.version;
         this.endpointURL = String(new URL(app.config.api.endpointPath, app.config.api.url)); // TODO fetchMock does not support URL
         this.baseURL = new URL(app.config.api.url).toString().replace(/\/$/, '');
-        this.bulk = createBulkApiFetch({ config: this.appConfig });
+        this.bulk = createBulkApiFetch({ config: this.appConfig, cacheKey: app.userProfile.sub });
 
         this.fetchAuth = createApiFetch({ config: app.config });
         this.disableBulk = app.config.api.disableBulk;
diff --git a/frontend_src/vstutils/bulk.ts b/frontend_src/vstutils/bulk.ts
index b509c6a5..cd1a58cd 100644
--- a/frontend_src/vstutils/bulk.ts
+++ b/frontend_src/vstutils/bulk.ts
@@ -2,9 +2,20 @@ import { createApiFetch } from './api-fetch';
 import type { InitAppConfig } from './init-app';
 import { BulkType, makeQueryString, type HttpMethod } from './utils';
 
-const CACHE_NAME = 'bulk-etags';
+const CACHE_NAME_PREFIX = 'bulk-etags-';
 const IS_NATIVE_CACHE_AVAILABLE = 'caches' in window;
 
+async function removeOldCaches(cacheKey: string) {
+    const actualName = getCacheName(cacheKey);
+    const cacheNames = await caches.keys();
+    const oldCaches = cacheNames.filter((name) => name.startsWith(CACHE_NAME_PREFIX) && name !== actualName);
+    await Promise.all(oldCaches.map((name) => caches.delete(name)));
+}
+
+function getCacheName(cacheKey: string) {
+    return `${CACHE_NAME_PREFIX}${cacheKey}`;
+}
+
 type RawBulk = {
     method: HttpMethod | Uppercase<HttpMethod>;
     path: string | (string | number)[];
@@ -51,7 +62,7 @@ export type BulkApiFetch = _BulkApiFetch & { raw: _BulkApiFetchRaw };
 
 const _cached = new WeakMap<InitAppConfig, BulkApiFetch>();
 
-export function createBulkApiFetch(params: { config: InitAppConfig }): BulkApiFetch {
+export function createBulkApiFetch(params: { config: InitAppConfig; cacheKey?: string }): BulkApiFetch {
     let bulk = _cached.get(params.config);
     if (!bulk) {
         bulk = _createBulkApiFetch(params);
@@ -60,7 +71,13 @@ export function createBulkApiFetch(params: { config: InitAppConfig }): BulkApiFe
     return bulk;
 }
 
-function _createBulkApiFetch({ config }: { config: InitAppConfig }): BulkApiFetch {
+function _createBulkApiFetch({
+    config,
+    cacheKey,
+}: {
+    config: InitAppConfig;
+    cacheKey?: string;
+}): BulkApiFetch {
     const apiFetch = createApiFetch({ config });
     const endpointUrl = new URL(config.api.endpointPath, config.api.url);
     let collectedBulks: CollectedBulkRequest[] = [];
@@ -97,7 +114,7 @@ function _createBulkApiFetch({ config }: { config: InitAppConfig }): BulkApiFetc
         requests: BulkRequest[],
         params?: { type?: BulkType; forceAuthRequired?: boolean },
     ) => {
-        const cache = await window.caches.open(CACHE_NAME);
+        const cache = await window.caches.open(getCacheName(cacheKey!));
         const cachedValues = new Map();
         for (let i = 0; i < requests.length; i++) {
             const item = requests[i];
@@ -143,7 +160,11 @@ function _createBulkApiFetch({ config }: { config: InitAppConfig }): BulkApiFetc
         return responses;
     };
 
-    const sendBulk = IS_NATIVE_CACHE_AVAILABLE ? sendBulkCached : sendBulkNotCached;
+    const useCache = cacheKey && IS_NATIVE_CACHE_AVAILABLE;
+    const sendBulk = useCache ? sendBulkCached : sendBulkNotCached;
+    if (useCache) {
+        removeOldCaches(cacheKey);
+    }
 
     async function sendCollectedBulks() {
         const bulks = [...collectedBulks];

From 44e48315f79cd6865a04ef19885b6e089c4838ac Mon Sep 17 00:00:00 2001
From: Julia Uschenko <julia.uschenko@gmail.com>
Date: Tue, 6 Aug 2024 12:30:23 +1000
Subject: [PATCH 44/46] Fix(backend): Return custom profile claims in user
 profile endpoint response.

---
 test_src/test_proj/tests.py           |  7 +++++++
 vstutils/__init__.py                  |  2 +-
 vstutils/oauth2/authorization_code.py |  1 -
 vstutils/oauth2/endpoints.py          | 23 +++++------------------
 vstutils/oauth2/user.py               | 22 ++++++++++++++++++----
 5 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/test_src/test_proj/tests.py b/test_src/test_proj/tests.py
index 3df09832..31d2d702 100644
--- a/test_src/test_proj/tests.py
+++ b/test_src/test_proj/tests.py
@@ -7654,3 +7654,10 @@ def test_custom_user_claims(self):
             oauth2_server_jwk_set,
         )
         self.assertEqual(id_token['locale'], 'fr-CA')
+        
+        response = self.client_class().get(
+            '/api/oauth2/userinfo/',
+            HTTP_AUTHORIZATION=f'Bearer {response.json()["access_token"]}',
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json()['anon'], True)
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index a6bb2c03..4220654f 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0rc1'
+__version__: str = '5.10.0rc2'
diff --git a/vstutils/oauth2/authorization_code.py b/vstutils/oauth2/authorization_code.py
index bf4a90e4..b720cfc4 100644
--- a/vstutils/oauth2/authorization_code.py
+++ b/vstutils/oauth2/authorization_code.py
@@ -88,7 +88,6 @@ def get_jwt_config(self, grant):
     def generate_user_info(self, user: UserWrapper, scope):
         profile = UserInfo(
             sub=user.get_user_id(),
-            anon=user.is_anon(),
         )
         if profile_claims := user.get_profile_claims():
             profile.update(profile_claims)
diff --git a/vstutils/oauth2/endpoints.py b/vstutils/oauth2/endpoints.py
index 7ac57300..8769375e 100644
--- a/vstutils/oauth2/endpoints.py
+++ b/vstutils/oauth2/endpoints.py
@@ -15,6 +15,7 @@
 from vstutils.api.responses import HTTP_200_OK
 
 from .authentication import JWTBearerTokenAuthentication
+from .user import UserWrapper
 
 if TYPE_CHECKING:
     from authlib.oauth2.rfc6749 import AuthorizationServer  # nocv
@@ -186,24 +187,10 @@ def get(self, request):
         user = request.user
         token = request.auth
 
-        if user.is_anonymous:
-            return HTTP_200_OK(
-                {
-                    "sub": token['sub'],
-                    "anon": True,
-                }
-            )
-
-        return HTTP_200_OK(
-                {
-                    "sub": token['sub'],
-                    "name": user.get_full_name(),
-                    "given_name": user.first_name,
-                    "family_name": user.last_name,
-                    "preferred_username": user.get_username(),
-                    "email": user.email,
-                }
-            )
+        return HTTP_200_OK({
+            'sub': token['sub'],
+            **UserWrapper(user).get_profile_claims(),
+        })
 
 
 def oauth_authorization_server(request: Request):
diff --git a/vstutils/oauth2/user.py b/vstutils/oauth2/user.py
index 8ff8223f..7de50153 100644
--- a/vstutils/oauth2/user.py
+++ b/vstutils/oauth2/user.py
@@ -1,4 +1,4 @@
-from typing import Optional, Union, TYPE_CHECKING
+from typing import Optional, Union, TYPE_CHECKING, Any
 from uuid import uuid4
 
 if TYPE_CHECKING:  # nocv
@@ -30,10 +30,24 @@ def second_factor_required(self):
     def validate_second_factor(self, code):
         return self.django_user.twofa.verify(code)
 
-    def get_profile_claims(self) -> Optional[dict]:
+    def get_profile_claims(self) -> dict:
+        claims: dict[str, Any] = {}
+
+        if self.django_user.is_anonymous:
+            claims['anon'] = True
+        else:
+            claims.update({
+                "name": self.django_user.get_full_name(),
+                "given_name": self.django_user.first_name,
+                "family_name": self.django_user.last_name,
+                "preferred_username": self.django_user.get_username(),
+                "email": self.django_user.email,
+            })
+
         if hasattr(self.django_user, 'get_profile_claims'):
-            return self.django_user.get_profile_claims()
-        return None
+            claims.update(self.django_user.get_profile_claims())
+
+        return claims
 
     def get_access_token_claims(self) -> Optional[dict]:
         if hasattr(self.django_user, 'get_access_token_claims'):

From a559639490d31a0ac0845a63081b398e942b02aa Mon Sep 17 00:00:00 2001
From: Dmitriy Ovcharenko <ovcharenkodd@gmail.com>
Date: Wed, 7 Aug 2024 13:35:02 +1000
Subject: [PATCH 45/46] Feature(frontend): Add onBefore signal for actions

---
 doc/locale/ru/LC_MESSAGES/quickstart-front.po | 137 ++++++++++--------
 doc/quickstart-front.rst                      |  25 ++++
 frontend_src/index.ts                         |   2 +
 .../__tests__/operation-hooks.test.ts         |  25 ++++
 frontend_src/vstutils/actions.ts              |   9 +-
 .../vstutils/components/common/AppModals.vue  |  21 ++-
 .../components/common/ConfirmModal.vue        |   4 +-
 frontend_src/vstutils/confirmation-modal.ts   |  35 +++++
 frontend_src/vstutils/signals.ts              |  25 +++-
 frontend_src/vstutils/utils/index.ts          |   2 +
 frontend_src/vstutils/views/View.ts           |  57 +-------
 frontend_src/vstutils/views/index.ts          |   1 +
 frontend_src/vstutils/views/openapi.ts        |  12 +-
 frontend_src/vstutils/views/operations.ts     |  72 +++++++++
 14 files changed, 295 insertions(+), 132 deletions(-)
 create mode 100644 frontend_src/vstutils/__tests__/operation-hooks.test.ts
 create mode 100644 frontend_src/vstutils/confirmation-modal.ts
 create mode 100644 frontend_src/vstutils/views/operations.ts

diff --git a/doc/locale/ru/LC_MESSAGES/quickstart-front.po b/doc/locale/ru/LC_MESSAGES/quickstart-front.po
index 3e98edfa..d426a021 100644
--- a/doc/locale/ru/LC_MESSAGES/quickstart-front.po
+++ b/doc/locale/ru/LC_MESSAGES/quickstart-front.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VST Utils 5.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-26 04:59+0000\n"
+"POT-Creation-Date: 2024-08-06 08:49+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -186,11 +186,26 @@ msgstr ""
 msgid "Example of simple frontend entrypoint:"
 msgstr "Пример точки входа фронтенда:"
 
-#: ../../quickstart-front.rst:102
+#: ../../quickstart-front.rst:99
+msgid "Operation views hooks"
+msgstr "Хуки операций страниц"
+
+#: ../../quickstart-front.rst:100
+msgid ""
+"Function `hookViewOperation` can be used to execute some custom code "
+"before action execution. Action may be prevented if `prevent` is set to "
+"true on returned object."
+msgstr ""
+"Функция `hookViewOperation` может быть использована для выполнения "
+"произвольного кода перед выполнением действия. Действие "
+"может быть прервано, если `prevent` на возвращаемом объекте установлено "
+"на `true`."
+
+#: ../../quickstart-front.rst:127
 msgid "Field customization"
 msgstr "Настройка поля"
 
-#: ../../quickstart-front.rst:103
+#: ../../quickstart-front.rst:128
 msgid ""
 "In `main.js` create new field by extending it from BaseField (or any "
 "other appropriate field)"
@@ -198,7 +213,7 @@ msgstr ""
 "В `main.js` создайте новое поле, расширив его от BaseField (или любого "
 "другого подходящего поля)"
 
-#: ../../quickstart-front.rst:105
+#: ../../quickstart-front.rst:130
 msgid ""
 "For example lets create a field that renders HTML h1 element with 'Hello "
 "World!` text:"
@@ -206,11 +221,11 @@ msgstr ""
 "Например, создадим поле, которое отображает элемент HTML h1 с текстом "
 "'Привет, мир!'"
 
-#: ../../quickstart-front.rst:119
+#: ../../quickstart-front.rst:144
 msgid "Or render person's name with some prefix"
 msgstr "Или отобразите имя человека с некоторым префиксом"
 
-#: ../../quickstart-front.rst:134
+#: ../../quickstart-front.rst:159
 msgid ""
 "Register this field to `app.fieldsResolver` to provide appropriate field "
 "format and type to a new field"
@@ -218,7 +233,7 @@ msgstr ""
 "Зарегистрируйте это поле в `app.fieldsResolver`, чтобы предоставить "
 "соответствующий формат и тип поля для нового поля"
 
-#: ../../quickstart-front.rst:141
+#: ../../quickstart-front.rst:166
 msgid ""
 "Listen for a appropriate "
 "`models[ModelWithFieldToChange].fields.beforeInit` signal to change field"
@@ -228,7 +243,7 @@ msgstr ""
 "`models[ModelWithFieldToChange].fields.beforeInit` для изменения формата "
 "поля"
 
-#: ../../quickstart-front.rst:150
+#: ../../quickstart-front.rst:175
 msgid ""
 "List of  models and their fields is available during runtime in console "
 "at `app.modelsClasses`"
@@ -236,7 +251,7 @@ msgstr ""
 "Список моделей и их полей доступен во время выполнения в консоли по "
 "адресу `app.modelsClasses`"
 
-#: ../../quickstart-front.rst:152
+#: ../../quickstart-front.rst:177
 msgid ""
 "To change Filed behavior, create new field class with a desired logic. "
 "Let's say you need to send number of milliseconds to API, user however "
@@ -248,7 +263,7 @@ msgstr ""
 "пользователь хочет вводить количество секунд. Решением будет "
 "переопределить методы `toInner` и `toRepresent` поля."
 
-#: ../../quickstart-front.rst:173
+#: ../../quickstart-front.rst:198
 msgid ""
 "Now you have field that show seconds, but saves/receives data in "
 "milliseconds on detail view of AllFieldsModel."
@@ -257,7 +272,7 @@ msgstr ""
 " данные в миллисекундах в виде детализированного представления модели "
 "AllFieldsModel."
 
-#: ../../quickstart-front.rst:176
+#: ../../quickstart-front.rst:201
 msgid ""
 "If you need to show some warning or error to developer console you can "
 "use field `warn` and `error` methods. You can pass some message and it "
@@ -268,11 +283,11 @@ msgstr ""
 "можете передать сообщение, и оно будет выведено с типом поля, именем "
 "модели и именем поля."
 
-#: ../../quickstart-front.rst:180
+#: ../../quickstart-front.rst:205
 msgid "Change path to FkField"
 msgstr "Изменение пути к полю FkField"
 
-#: ../../quickstart-front.rst:181
+#: ../../quickstart-front.rst:206
 msgid ""
 "Sometime you may need to request different set of objects for FkField. "
 "For example to choose from only famous authors, create `famous_author` "
@@ -284,7 +299,7 @@ msgstr ""
 "конечную точку `famous_author` на бэкенде и установите путь запроса "
 "FkField в `famous_author`. Слушайте сигнал `app.beforeInit`."
 
-#: ../../quickstart-front.rst:191
+#: ../../quickstart-front.rst:216
 msgid ""
 "Now when we create new post on `/post/` endpoint Author FkField makes get"
 " request to `/famous_author/` instead of `/author/`. It's useful to get "
@@ -296,15 +311,15 @@ msgstr ""
 "полезно для получения другого набора авторов (которые могли быть ранее "
 "отфильтрованы на бэкенде)."
 
-#: ../../quickstart-front.rst:195
+#: ../../quickstart-front.rst:220
 msgid "CSS Styling"
 msgstr "Стилизация CSS"
 
-#: ../../quickstart-front.rst:197
+#: ../../quickstart-front.rst:222
 msgid "Like scripts, css files may be added to `index.ts`"
 msgstr "Как скрипты, файлы CSS могут быть добавлены в `index.ts`"
 
-#: ../../quickstart-front.rst:212
+#: ../../quickstart-front.rst:237
 msgid ""
 "Let's inspect page and find css class for our customField. It is `column-"
 "format-customField` and  generated with `column-format-{Field.format}` "
@@ -314,11 +329,11 @@ msgstr ""
 "пользовательского поля. Это `column-format-customField` и создается с "
 "использованием шаблона `column-format-{Field.format}`."
 
-#: ../../quickstart-front.rst:215
+#: ../../quickstart-front.rst:240
 msgid "Use regular css styling to change appearance of the field."
 msgstr "Используйте обычные стили CSS для изменения внешнего вида поля."
 
-#: ../../quickstart-front.rst:225
+#: ../../quickstart-front.rst:250
 msgid ""
 "Other page elements are also available for styling: for example, to hide "
 "certain column set corresponding field to none."
@@ -327,11 +342,11 @@ msgstr ""
 "скрыть определенный столбец, установите соответствующее поле в значение "
 "none."
 
-#: ../../quickstart-front.rst:234
+#: ../../quickstart-front.rst:259
 msgid "Show primary key column on list"
 msgstr "Показать столбец первичных ключей в списке"
 
-#: ../../quickstart-front.rst:236
+#: ../../quickstart-front.rst:261
 msgid ""
 "Every pk column has `pk-column` CSS class and hidden by default (using "
 "`display: none;`)."
@@ -339,7 +354,7 @@ msgstr ""
 "Каждый столбец первичного ключа имеет класс CSS `pk-column` и по "
 "умолчанию скрыт (с использованием `display: none;`)."
 
-#: ../../quickstart-front.rst:238
+#: ../../quickstart-front.rst:263
 msgid ""
 "For example this style will show pk column on all list views of `Order` "
 "model:"
@@ -347,11 +362,11 @@ msgstr ""
 "Например, этот стиль покажет столбец первичных ключей во всех "
 "представлениях списка модели `Order`."
 
-#: ../../quickstart-front.rst:248
+#: ../../quickstart-front.rst:273
 msgid "View customization"
 msgstr "Настройка представления"
 
-#: ../../quickstart-front.rst:250
+#: ../../quickstart-front.rst:275
 msgid ""
 "Listen for signal `\"allViews.created\"` and add new custom mixin to the "
 "view."
@@ -359,13 +374,13 @@ msgstr ""
 "Слушайте сигнал `\"allViews.created\"` и добавьте новый пользовательский "
 "миксин в представление."
 
-#: ../../quickstart-front.rst:252
+#: ../../quickstart-front.rst:277
 msgid "Next code snippet depicts rendering new view instead of default view."
 msgstr ""
 "В следующем фрагменте кода показано отображение нового представления "
 "вместо представления по умолчанию."
 
-#: ../../quickstart-front.rst:265
+#: ../../quickstart-front.rst:290
 msgid ""
 "Learn more about Vue `render()` function at `Vue documentation "
 "<https://v3.vuejs.org/guide/render-function.html>`_."
@@ -373,7 +388,7 @@ msgstr ""
 "Узнайте больше о функции `render()` Vue в `документации Vue "
 "<https://v3.vuejs.org/guide/render-function.html>`_."
 
-#: ../../quickstart-front.rst:268
+#: ../../quickstart-front.rst:293
 msgid ""
 "It is also possible to fine tune View by overriding default computed "
 "properties and methods of existing mixins. For example, override "
@@ -384,7 +399,7 @@ msgstr ""
 "вычисляемое свойство `breadcrumbs` для отключения хлебных крошек в "
 "представлении списка авторов."
 
-#: ../../quickstart-front.rst:285
+#: ../../quickstart-front.rst:310
 msgid ""
 "Sometimes you may need to hide detail page for some reason, but still "
 "want all actions and sublinks to be accessible from list page. To do it "
@@ -397,11 +412,11 @@ msgstr ""
 "`\"allViews.created\"` и изменить параметр `hidden` с значения `false` по"
 " умолчанию на `true`, например:"
 
-#: ../../quickstart-front.rst:297
+#: ../../quickstart-front.rst:322
 msgid "Changing title of the view"
 msgstr "Изменение заголовка представления"
 
-#: ../../quickstart-front.rst:299
+#: ../../quickstart-front.rst:324
 msgid ""
 "To change title and string displayed in the breadcrumbs change `title` "
 "property of the view or method `getTitle` for more complex logic."
@@ -410,11 +425,11 @@ msgstr ""
 "измените свойство `title` представления или метод `getTitle` для более "
 "сложной логики."
 
-#: ../../quickstart-front.rst:313
+#: ../../quickstart-front.rst:338
 msgid "Page store"
 msgstr "Хранилище страницы"
 
-#: ../../quickstart-front.rst:314
+#: ../../quickstart-front.rst:339
 msgid ""
 "Every page has store that can be accessed globally `app.store.page` or "
 "from page component using `this.store`."
@@ -423,17 +438,17 @@ msgstr ""
 "`app.store.page` или из компонента страницы с использованием "
 "`this.store`."
 
-#: ../../quickstart-front.rst:316
+#: ../../quickstart-front.rst:341
 msgid "View method `extendStore` can be used to add custom logic to page's store."
 msgstr ""
 "Метод представления `extendStore` можно использовать для добавления "
 "пользовательской логики в хранилище страницы."
 
-#: ../../quickstart-front.rst:342
+#: ../../quickstart-front.rst:367
 msgid "Overriding root component"
 msgstr "Переопределение корневого компонента"
 
-#: ../../quickstart-front.rst:343
+#: ../../quickstart-front.rst:368
 msgid ""
 "Root component of the application can be overridden using "
 "`app.beforeInit` signal. This can be useful for such things as changing "
@@ -444,15 +459,15 @@ msgstr ""
 " классов CSS макета, поведения кнопки назад или основных компонентов "
 "макета."
 
-#: ../../quickstart-front.rst:346
+#: ../../quickstart-front.rst:371
 msgid "Example of customizing sidebar component:"
 msgstr "Пример настройки компонента боковой панели:"
 
-#: ../../quickstart-front.rst:360
+#: ../../quickstart-front.rst:385
 msgid "Translating values of fields"
 msgstr "Перевод значений полей"
 
-#: ../../quickstart-front.rst:361
+#: ../../quickstart-front.rst:386
 msgid ""
 "Values tha displayed by `FKField` of `ChoicesField` can be translated "
 "using standard translations files."
@@ -460,7 +475,7 @@ msgstr ""
 "Значения, отображаемые с использованием `FKField` или `ChoicesField`, "
 "могут быть переведены с использованием стандартных файлов перевода."
 
-#: ../../quickstart-front.rst:363
+#: ../../quickstart-front.rst:388
 msgid ""
 "Translation key must be defined as "
 "`:model:<ModelName>:<fieldName>:<value>`. For example:"
@@ -468,7 +483,7 @@ msgstr ""
 "Ключ перевода должен быть определен как "
 "`:model:<ModelName>:<fieldName>:<value>`. Например:"
 
-#: ../../quickstart-front.rst:371
+#: ../../quickstart-front.rst:396
 msgid ""
 "Translation of values can be taxing as every model on backend usually "
 "generates more than one model on frontend, To avoid this, add "
@@ -480,11 +495,11 @@ msgstr ""
 "этого добавьте атрибут `_translate_model = 'Category'` к модели на "
 "бэкенде. Это сокращает"
 
-#: ../../quickstart-front.rst:381
+#: ../../quickstart-front.rst:406
 msgid "to"
 msgstr "в"
 
-#: ../../quickstart-front.rst:387
+#: ../../quickstart-front.rst:412
 msgid ""
 "For `FKField` name of the related model is used. And `fieldName` should "
 "be equal to `viewField`."
@@ -492,11 +507,11 @@ msgstr ""
 "Для `FKField` используется имя связанной модели. И `fieldName` должно "
 "быть равно `viewField`."
 
-#: ../../quickstart-front.rst:393
+#: ../../quickstart-front.rst:418
 msgid "Changing actions or sublinks"
 msgstr "Изменение действий или подссылок"
 
-#: ../../quickstart-front.rst:395
+#: ../../quickstart-front.rst:420
 msgid ""
 "Sometimes using only schema for defining actions or sublinks is not "
 "enough."
@@ -504,7 +519,7 @@ msgstr ""
 "Иногда использование только схемы для определения действий или подссылок "
 "недостаточно."
 
-#: ../../quickstart-front.rst:397
+#: ../../quickstart-front.rst:422
 msgid ""
 "For example we have an action to make user a superuser "
 "(`/user/{id}/make_superuser/`) and we want to hide that action if user is"
@@ -517,15 +532,15 @@ msgstr ""
 "(`is_superuser` равно `true`). Сигнал `<${PATH}>filterActions` может быть"
 " использован для достижения такого результата."
 
-#: ../../quickstart-front.rst:409
+#: ../../quickstart-front.rst:434
 msgid "`<${PATH}>filterActions` recieves {actions, data}"
 msgstr "`<${PATH}>filterActions` получает {actions, data}"
 
-#: ../../quickstart-front.rst:410
+#: ../../quickstart-front.rst:435
 msgid "`<${PATH}>filterSublinks` recieves {sublinks, data}"
 msgstr "`<${PATH}>filterSublinks` получает {sublinks, data}"
 
-#: ../../quickstart-front.rst:412
+#: ../../quickstart-front.rst:437
 msgid ""
 "Data property will contain instance's data. Actions and sublinks "
 "properties will contain arrays with default items (not hidden action or "
@@ -535,11 +550,11 @@ msgstr ""
 "`sublinks` будут содержать массивы с элементами по умолчанию (не скрытыми"
 " действиями или подссылками), их можно изменить или полностью заменить."
 
-#: ../../quickstart-front.rst:418
+#: ../../quickstart-front.rst:443
 msgid "LocalSettings"
 msgstr "Локальные настройки"
 
-#: ../../quickstart-front.rst:420
+#: ../../quickstart-front.rst:445
 msgid ""
 "This model's fields are displayed in the left sidebar. All data from this"
 " model saves in browser Local Storage. If you want to add another "
@@ -550,15 +565,15 @@ msgstr ""
 "добавить другие варианты, вы можете сделать это, используя сигнал "
 "`beforeInit`, например:"
 
-#: ../../quickstart-front.rst:434
+#: ../../quickstart-front.rst:459
 msgid "Store"
 msgstr "Хранилище"
 
-#: ../../quickstart-front.rst:436
+#: ../../quickstart-front.rst:461
 msgid "There are three ways to store data:"
 msgstr "Есть три способа сохранения данных:"
 
-#: ../../quickstart-front.rst:438
+#: ../../quickstart-front.rst:463
 msgid ""
 "userSettingsStore - saves data on the server. By default, there are "
 "options for changing language and a button to turn on/off the dark mode. "
@@ -568,7 +583,7 @@ msgstr ""
 "варианты изменения языка и кнопка включения/выключения темного режима. "
 "Данные для userSettingsStore поступают из схемы."
 
-#: ../../quickstart-front.rst:440
+#: ../../quickstart-front.rst:465
 msgid ""
 "localSettingsStore - saves data in the browser Local Storage. This is "
 "where you can store your own fields, as described in "
@@ -578,11 +593,11 @@ msgstr ""
 "Здесь вы можете хранить свои собственные поля, как описано в "
 ":ref:`localSettings`."
 
-#: ../../quickstart-front.rst:441
+#: ../../quickstart-front.rst:466
 msgid "store - stores current page data."
 msgstr "store - хранит данные текущей страницы."
 
-#: ../../quickstart-front.rst:443
+#: ../../quickstart-front.rst:468
 msgid ""
 "To use any of this stores you need to run the following command: "
 ":code:`app.[storeName]`, for example: :code:`app.userSettingsStore`."
@@ -591,7 +606,7 @@ msgstr ""
 "команду: :code:`app.[storeName]`, например: "
 ":code:`app.userSettingsStore`."
 
-#: ../../quickstart-front.rst:445
+#: ../../quickstart-front.rst:470
 msgid ""
 "If you are accessing the userSettingsStore from within the component then"
 " you need to use :code:`this.$app` instead :code:`app`."
@@ -599,11 +614,11 @@ msgstr ""
 "Если вы обращаетесь к userSettingsStore изнутри компонента, тогда вам "
 "нужно использовать :code:`this.$app` вместо :code:`app`."
 
-#: ../../quickstart-front.rst:447
+#: ../../quickstart-front.rst:472
 msgid "From `app.store` you may need:"
 msgstr "Из `app.store` вам может потребоваться:"
 
-#: ../../quickstart-front.rst:449
+#: ../../quickstart-front.rst:474
 msgid ""
 "`vewsItems` and `viewItemsMap` - stores information about parent views "
 "for this page. It is used for example in breadcrumbs. The difference "
@@ -616,11 +631,11 @@ msgstr ""
 "информации: `viewItems` - это массив объектов, а `viewItemsMap` - это "
 "карта."
 
-#: ../../quickstart-front.rst:451
+#: ../../quickstart-front.rst:476
 msgid "`page` - saves all information about current page."
 msgstr "`page` - сохраняет всю информацию о текущей странице."
 
-#: ../../quickstart-front.rst:452
+#: ../../quickstart-front.rst:477
 msgid "`title` - title of current page."
 msgstr "`title` - заголовок текущей страницы."
 
diff --git a/doc/quickstart-front.rst b/doc/quickstart-front.rst
index 2ebe18e3..d5007ab8 100644
--- a/doc/quickstart-front.rst
+++ b/doc/quickstart-front.rst
@@ -95,6 +95,31 @@ Example of simple frontend entrypoint:
     });
 
 
+Operation views hooks
+---------------------
+Function `hookViewOperation` can be used to execute some custom code before action execution.
+Action may be prevented if `prevent` is set to true on returned object.
+
+.. sourcecode:: typescript
+
+    import { hookViewOperation, showConfirmationModal } from '@vstconsulting/vstutils';
+
+    hookViewOperation({
+      path: '/category/{id}/change_parent/',
+      operation: 'execute',
+      onBefore: async () => {
+        const isConfirmed = await showConfirmationModal({
+          title: 'Are you sure?',
+          text: 'Changing category parent is irreversible',
+          confirmButtonText: 'Change',
+          cancelButtonText: 'Cancel',
+        });
+        return {
+          prevent: !isConfirmed,
+        };
+      },
+    });
+
 
 .. _field-section:
 
diff --git a/frontend_src/index.ts b/frontend_src/index.ts
index 2d89b3b1..f3afae4d 100644
--- a/frontend_src/index.ts
+++ b/frontend_src/index.ts
@@ -13,7 +13,9 @@ export {
     onSchemaLoaded,
     onSchemaModelsCreated,
     onSchemaViewsCreated,
+    hookViewOperation,
 } from './vstutils/signals';
 export { type AppSchema } from './vstutils/schema';
 export { defineFieldComponent } from './vstutils/fields/base/defineFieldComponent';
 export { BaseField } from './vstutils/fields/base/BaseField';
+export { showConfirmationModal } from './vstutils/confirmation-modal';
diff --git a/frontend_src/vstutils/__tests__/operation-hooks.test.ts b/frontend_src/vstutils/__tests__/operation-hooks.test.ts
new file mode 100644
index 00000000..8f481269
--- /dev/null
+++ b/frontend_src/vstutils/__tests__/operation-hooks.test.ts
@@ -0,0 +1,25 @@
+import { createApp, createSchema, useTestCtx } from '#unittests';
+import { hookViewOperation } from '../signals';
+
+test('operations hooks', async () => {
+    const onBefore = vitest.fn((() => {
+        return {
+            prevent: true,
+        };
+    }) satisfies Parameters<typeof hookViewOperation>[0]['onBefore']);
+
+    hookViewOperation({ path: '/user/new/', operation: 'save', onBefore });
+
+    await createApp({ schema: createSchema() });
+    const { screen, app, user } = useTestCtx();
+
+    await app.router.push('/user/new/');
+
+    const saveBtn = await screen.findByTitle('Save');
+    await user.click(saveBtn);
+
+    expect(onBefore).toBeCalledTimes(1);
+    expect(onBefore).toBeCalledWith({
+        operation: app.views.get('/user/new/')!.actions.get('save'),
+    });
+});
diff --git a/frontend_src/vstutils/actions.ts b/frontend_src/vstutils/actions.ts
index cc6b2a3b..8bb707bd 100644
--- a/frontend_src/vstutils/actions.ts
+++ b/frontend_src/vstutils/actions.ts
@@ -27,7 +27,7 @@ export class ActionsManager {
         return this.app.router.currentRoute.meta?.view as IView;
     }
 
-    execute(args: {
+    async execute(args: {
         action: Action;
         instance?: Model;
         instances?: Model[];
@@ -44,6 +44,13 @@ export class ActionsManager {
             disablePopUp = false,
         } = args;
 
+        if (action.onBefore) {
+            const { prevent } = (await action.onBefore({ operation: action })) ?? {};
+            if (prevent) {
+                return;
+            }
+        }
+
         if (action.confirmationRequired && !skipConfirmation) {
             return this.app.initActionConfirmationModal({ title: action.title }).then(() => {
                 args.skipConfirmation = true;
diff --git a/frontend_src/vstutils/components/common/AppModals.vue b/frontend_src/vstutils/components/common/AppModals.vue
index 2e950b5d..b2245064 100644
--- a/frontend_src/vstutils/components/common/AppModals.vue
+++ b/frontend_src/vstutils/components/common/AppModals.vue
@@ -26,21 +26,40 @@
             @confirm="reloadPage"
         />
 
+        <ConfirmModal
+            v-if="_currentConfirmationModal"
+            ref="customConfirmationModal"
+            :title="_currentConfirmationModal.title"
+            :message="_currentConfirmationModal.text"
+            :confirm-title="_currentConfirmationModal.confirmButtonText"
+            :reject-title="_currentConfirmationModal.cancelButtonText"
+            @confirm="_currentConfirmationModal.confirm"
+            @reject="_currentConfirmationModal.reject"
+        />
+
         <slot />
     </div>
 </template>
 
 <script setup lang="ts">
-    import { ref } from 'vue';
+    import { ref, watchEffect } from 'vue';
     import { i18n } from '#vstutils/translation';
     import { getApp, saveAllSettings } from '#vstutils/utils';
     import ConfirmModal from './ConfirmModal.vue';
+    import { _currentConfirmationModal } from '#vstutils/confirmation-modal';
 
     const app = getApp();
 
     const saveSettingsModal = ref<InstanceType<typeof ConfirmModal>>();
     const confirmationModal = ref<InstanceType<typeof ConfirmModal>>();
     const reloadPageModal = ref<InstanceType<typeof ConfirmModal>>();
+    const customConfirmationModal = ref<InstanceType<typeof ConfirmModal>>();
+
+    watchEffect(() => {
+        if (customConfirmationModal.value) {
+            customConfirmationModal.value.openModal();
+        }
+    });
 
     const confirmation = ref<{ callback: null | (() => void); actionName: string }>({
         callback: null,
diff --git a/frontend_src/vstutils/components/common/ConfirmModal.vue b/frontend_src/vstutils/components/common/ConfirmModal.vue
index aefa675f..02b86f38 100644
--- a/frontend_src/vstutils/components/common/ConfirmModal.vue
+++ b/frontend_src/vstutils/components/common/ConfirmModal.vue
@@ -8,10 +8,10 @@
             </div>
         </template>
         <template #footer>
-            <button class="btn btn-success" @click="callConfirm">
+            <button class="btn btn-success" type="button" @click="callConfirm">
                 {{ $t(confirmTitle) }}
             </button>
-            <button class="btn btn-secondary" style="float: right" @click="callReject">
+            <button class="btn btn-secondary" style="float: right" type="button" @click="callReject">
                 {{ $t(rejectTitle) }}
             </button>
         </template>
diff --git a/frontend_src/vstutils/confirmation-modal.ts b/frontend_src/vstutils/confirmation-modal.ts
new file mode 100644
index 00000000..cfbd868e
--- /dev/null
+++ b/frontend_src/vstutils/confirmation-modal.ts
@@ -0,0 +1,35 @@
+import { shallowRef } from 'vue';
+
+/**
+ * @internal
+ */
+export const _currentConfirmationModal = shallowRef<{
+    title: string;
+    text: string;
+    confirmButtonText?: string;
+    cancelButtonText?: string;
+
+    confirm: () => void;
+    reject: () => void;
+}>();
+
+export function showConfirmationModal(params: {
+    title: string;
+    text: string;
+    confirmButtonText?: string;
+    cancelButtonText?: string;
+}): Promise<boolean> {
+    return new Promise((resolve) => {
+        _currentConfirmationModal.value = {
+            ...params,
+            confirm: () => {
+                _currentConfirmationModal.value = undefined;
+                resolve(true);
+            },
+            reject: () => {
+                _currentConfirmationModal.value = undefined;
+                resolve(false);
+            },
+        };
+    });
+}
diff --git a/frontend_src/vstutils/signals.ts b/frontend_src/vstutils/signals.ts
index 64b8f5bf..61b96d00 100644
--- a/frontend_src/vstutils/signals.ts
+++ b/frontend_src/vstutils/signals.ts
@@ -6,7 +6,7 @@ import { capitalize, getApp } from '#vstutils/utils';
 import type { Model } from '#vstutils/models';
 import type { IAppInitialized } from '#vstutils/app';
 import type { RepresentData } from '#vstutils/utils';
-import type { Action, Sublink } from '#vstutils/views';
+import type { Action, OperationOnBeforeHook, Sublink } from './views/operations';
 import type { RouteConfig } from 'vue-router';
 import type { AppSchema } from './schema';
 
@@ -90,6 +90,29 @@ export const onAppBeforeInit = createHook<[{ app: IAppInitialized }]>(APP_BEFORE
 export const onSchemaViewsCreated = createHook<[{ views: IAppInitialized['views'] }]>(SCHEMA_VIEWS_CREATED);
 export const onRoutesCreated = createHook<[RouteConfig[]]>(ROUTES_CREATED);
 export const onSchemaLoaded = createHook<[AppSchema]>(SCHEMA_LOADED);
+export const hookViewOperation = (params: {
+    path: string;
+    operation: string;
+    onBefore?: OperationOnBeforeHook;
+}) => {
+    onSchemaViewsCreated(({ views }) => {
+        const view = views.get(params.path);
+        if (!view) {
+            console.error(`View "${params.path}" not found`);
+            return;
+        }
+
+        const operation = view.actions.get(params.operation) || view.sublinks.get(params.operation);
+        if (!operation) {
+            console.error(`Operation "${params.operation}" for view ${params.path} not found`);
+            return;
+        }
+
+        if (params.onBefore) {
+            operation.onBefore = params.onBefore;
+        }
+    });
+};
 
 export const onSchemaModelsCreated =
     createHook<[{ app: IAppInitialized; models: Map<string, Model> }]>(SCHEMA_MODELS_CREATED);
diff --git a/frontend_src/vstutils/utils/index.ts b/frontend_src/vstutils/utils/index.ts
index 5dd9b828..3dd65f7b 100644
--- a/frontend_src/vstutils/utils/index.ts
+++ b/frontend_src/vstutils/utils/index.ts
@@ -515,3 +515,5 @@ export function escapeHtml(unsafe: string) {
 }
 
 export const OBJECT_NOT_FOUND_TEXT = '[Object not found]';
+
+export type MaybePromise<T> = T | Promise<T>;
diff --git a/frontend_src/vstutils/views/View.ts b/frontend_src/vstutils/views/View.ts
index 6d839087..f1183f82 100644
--- a/frontend_src/vstutils/views/View.ts
+++ b/frontend_src/vstutils/views/View.ts
@@ -28,7 +28,6 @@ import {
 import { i18n } from '#vstutils/translation';
 
 import type { ComponentOptionsMixin } from 'vue/types/v3-component-options';
-import type { IAppInitialized } from '#vstutils/app';
 import type { Model, ModelConstructor } from '#vstutils/models';
 import type {
     BaseViewStore,
@@ -47,68 +46,14 @@ import type { Operation as SwaggerOperation } from 'swagger-schema-official';
 import type { QuerySet } from '../querySet';
 import type { BaseField, Field } from '../fields/base';
 import type { ViewProps } from './props';
+import type { Action, NotEmptyAction, Sublink } from './operations';
 
 export { ViewTypes };
 
-export interface Operation {
-    name: string;
-    title: string;
-    style?: Record<string, string | number> | string;
-    classes?: string[];
-    iconClasses?: string[];
-    appendFragment?: string;
-    hidden?: boolean;
-    doNotShowOnList?: boolean;
-    doNotGroup?: boolean;
-    isFileResponse?: boolean;
-    auth?: boolean;
-}
-
-export interface Sublink extends Operation {
-    href?: string | (() => string);
-    external?: boolean;
-}
-
 type ViewMixin = unknown;
 
 const getViewStoreId = createUniqueIdGenerator();
 
-/**
- * Object that describes one action.
- * For empty action path and method are required.
- * For non empty action component or href must me provided.
- */
-export interface Action extends Operation {
-    isEmpty?: boolean;
-    isMultiAction?: boolean;
-    component?: any;
-    path?: string;
-    href?: string;
-    method?: HttpMethod;
-    auth?: boolean;
-    confirmationRequired?: boolean;
-    view?: ActionView;
-    responseModel?: ModelConstructor;
-    handler?: (args: {
-        action: Action;
-        instance?: Model;
-        fromList?: boolean;
-        disablePopUp?: boolean;
-    }) => Promise<any> | any;
-    handlerMany?: (args: {
-        action: Action;
-        instances: Model[];
-        disablePopUp?: boolean;
-    }) => Promise<any> | any;
-    redirectPath?: string | (() => string);
-    onAfter?: (args: { app: IAppInitialized; action: Action; response: unknown; instance?: Model }) => void;
-}
-
-export interface NotEmptyAction extends Action {
-    isEmpty: false;
-    requestModel: ModelConstructor;
-}
-
 type ViewType = keyof typeof ViewTypes;
 
 export interface ViewParams extends SwaggerOperation {
diff --git a/frontend_src/vstutils/views/index.ts b/frontend_src/vstutils/views/index.ts
index f7eb8c0f..a541f38e 100644
--- a/frontend_src/vstutils/views/index.ts
+++ b/frontend_src/vstutils/views/index.ts
@@ -5,3 +5,4 @@ export { ViewConstructor, ViewsTree };
 
 export * from './View';
 export * from './props';
+export * from './operations';
diff --git a/frontend_src/vstutils/views/openapi.ts b/frontend_src/vstutils/views/openapi.ts
index 4605ec2c..f3fdad52 100644
--- a/frontend_src/vstutils/views/openapi.ts
+++ b/frontend_src/vstutils/views/openapi.ts
@@ -1,16 +1,8 @@
 import { defineAsyncComponent } from 'vue';
 import { getApp, ViewTypes } from '#vstutils/utils';
 
-import type {
-    Action,
-    ActionView,
-    IView,
-    ListView,
-    PageEditView,
-    PageNewView,
-    PageView,
-    ViewStore,
-} from './View';
+import type { ActionView, IView, ListView, PageEditView, PageNewView, PageView, ViewStore } from './View';
+import type { Action } from './operations';
 
 type Operations = Record<string, Record<string, Action>>;
 
diff --git a/frontend_src/vstutils/views/operations.ts b/frontend_src/vstutils/views/operations.ts
new file mode 100644
index 00000000..8178aca4
--- /dev/null
+++ b/frontend_src/vstutils/views/operations.ts
@@ -0,0 +1,72 @@
+import type { IAppInitialized } from '../app';
+import type { Model, ModelConstructor } from '../models';
+import type { HttpMethod, MaybePromise } from '../utils';
+import type { ActionView } from './View';
+
+export type OperationOnBeforeParams = {
+    operation: Operation;
+};
+
+export type OperationOnBeforeResult = {
+    prevent?: boolean;
+};
+
+export type OperationOnBeforeHook = (
+    params: OperationOnBeforeParams,
+) => MaybePromise<OperationOnBeforeResult | void>;
+
+export interface Operation {
+    name: string;
+    title: string;
+    style?: Record<string, string | number> | string;
+    classes?: string[];
+    iconClasses?: string[];
+    appendFragment?: string;
+    hidden?: boolean;
+    doNotShowOnList?: boolean;
+    doNotGroup?: boolean;
+    isFileResponse?: boolean;
+    auth?: boolean;
+    onBefore?: OperationOnBeforeHook;
+}
+
+export interface Sublink extends Operation {
+    href?: string | (() => string);
+    external?: boolean;
+}
+
+/**
+ * Object that describes one action.
+ * For empty action path and method are required.
+ * For non empty action component or href must me provided.
+ */
+export interface Action extends Operation {
+    isEmpty?: boolean;
+    isMultiAction?: boolean;
+    component?: any;
+    path?: string;
+    href?: string;
+    method?: HttpMethod;
+    auth?: boolean;
+    confirmationRequired?: boolean;
+    view?: ActionView;
+    responseModel?: ModelConstructor;
+    handler?: (args: {
+        action: Action;
+        instance?: Model;
+        fromList?: boolean;
+        disablePopUp?: boolean;
+    }) => Promise<any> | any;
+    handlerMany?: (args: {
+        action: Action;
+        instances: Model[];
+        disablePopUp?: boolean;
+    }) => Promise<any> | any;
+    redirectPath?: string | (() => string);
+    onAfter?: (args: { app: IAppInitialized; action: Action; response: unknown; instance?: Model }) => void;
+}
+
+export interface NotEmptyAction extends Action {
+    isEmpty: false;
+    requestModel: ModelConstructor;
+}

From 8b309544139a202dde909268edf6bd74e9c3ac3e Mon Sep 17 00:00:00 2001
From: Sergei Kliuikov <onegreyonewhite2013@gmail.com>
Date: Wed, 7 Aug 2024 13:35:19 -0700
Subject: [PATCH 46/46] Chore(package): Bump version and dependencies before
 release.

---
 package.json          |  2 +-
 requirements-prod.txt |  2 +-
 requirements-rtd.txt  |  2 +-
 requirements-test.txt |  2 +-
 requirements.txt      | 10 +++++-----
 setup.py              |  4 ++--
 vstutils/__init__.py  |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index fa30de64..146d4fbd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vstconsulting/vstutils",
-  "version": "5.10.0b14",
+  "version": "5.10.0",
   "type": "module",
   "author": "VST Consulting",
   "license": "Apache-2.0",
diff --git a/requirements-prod.txt b/requirements-prod.txt
index daa5fb78..43320eb3 100644
--- a/requirements-prod.txt
+++ b/requirements-prod.txt
@@ -2,6 +2,6 @@
 # PyMySQL>=0.9.2,<=0.9.3; python_version<'3.0'
 # mysql-connector-python==8.0.15; python_version>'3.4'
 # Advanced cache support
-redis[hiredis]~=5.0.7
+redis[hiredis]~=5.0.8
 tarantool~=1.2.0
 pywebpush~=2.0.0
diff --git a/requirements-rtd.txt b/requirements-rtd.txt
index a377bb3d..430aa792 100644
--- a/requirements-rtd.txt
+++ b/requirements-rtd.txt
@@ -1,7 +1,7 @@
 -rrequirements.txt
 -rrequirements-doc.txt
 -rrequirements-rpc.txt
-django~=5.0.6
+django~=5.0.8
 httpx>=0.27.0
 typing-extensions
 sphinx-intl~=2.2.0
diff --git a/requirements-test.txt b/requirements-test.txt
index b0e619e4..e62e874b 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,5 +1,5 @@
 # Packages needed for test
-coverage~=7.5.4
+coverage~=7.6.1
 fakeldap~=0.6.6
 tblib==3.0.0
 beautifulsoup4~=4.12.3
diff --git a/requirements.txt b/requirements.txt
index 019371ea..23c93d51 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,17 +6,17 @@ django-environ~=0.11.2
 # REST API packages
 djangorestframework~=3.15.2
 drf-yasg==1.21.7
-django-filter==24.2
+django-filter==24.3
 drf_orjson_renderer==1.7.1
 ormsgpack~=1.5.0
-pyyaml~=6.0.1
+pyyaml~=6.0.2
 
 # web server
-uvicorn~=0.30.1
+uvicorn~=0.30.5
 pyuwsgi==2.0.23.post0
 # Restore it if some problems with pyuwsgi
 # uwsgi==2.0.23
-fastapi-slim~=0.111.0
+fastapi-slim~=0.112.0
 aiofiles~=24.1.0
 asgiref>=3.8.1
 
@@ -34,4 +34,4 @@ django-htmlmin~=0.11.0
 pyotp~=2.9.0
 
 # Storage
-django-storages[libcloud]==1.14.3
+django-storages[libcloud]==1.14.4
diff --git a/setup.py b/setup.py
index 0a3ff435..df6b7aa9 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@
         r'vstutils/static/spa/.*\.css$'
     ],
     install_requires=[
-        "django~=" + (os.environ.get('DJANGO_DEP', "") or "5.0.6"),
+        "django~=" + (os.environ.get('DJANGO_DEP', "") or "5.0.8"),
     ]
     + requirements,
     extras_require={
@@ -57,7 +57,7 @@
         'doc': load_requirements('requirements-doc.txt'),
         'prod': load_requirements('requirements-prod.txt'),
         'stubs': load_requirements('requirements-stubs.txt'),
-        'pil': ['Pillow~=10.3.0'],
+        'pil': ['Pillow~=10.4.0'],
         'boto3': [
             i.replace('libcloud', 'libcloud,s3')
             for i in requirements
diff --git a/vstutils/__init__.py b/vstutils/__init__.py
index 4220654f..1c89fa1f 100644
--- a/vstutils/__init__.py
+++ b/vstutils/__init__.py
@@ -1,2 +1,2 @@
 # pylint: disable=django-not-available
-__version__: str = '5.10.0rc2'
+__version__: str = '5.10.0'