Merge branch 'main' into synthesis

.dockerignore

@@ -54,6 +54,7 @@ db.sqlite3-journal
 # React
 .DS_*
 *.log
+*.tsbuildinfo
 logs
 **/*.backup.*
 **/*.back.*

.github/workflows/frontend.yml

@@ -9,35 +9,35 @@ defaults:
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
     paths:
       - rsconcept/frontend/**
       - .github/workflows/frontend.yml
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 jobs:
   build:
-
     runs-on: ubuntu-22.04
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [22.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
-    - name: Use Node.js ${{ matrix.node-version }}
+      - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+        uses: actions/setup-node@v4
-      with:
+        with:
-        node-version: ${{ matrix.node-version }}
+          node-version: ${{ matrix.node-version }}
-        cache-dependency-path: rsconcept/frontend/package-lock.json
+          cache-dependency-path: rsconcept/frontend/package-lock.json
-        cache: 'npm'
+          cache: "npm"
-    - name: Build
+      - name: Build
-      run: |
+        run: |
-        npm ci
+          npm install -g typescript vite jest
-        npm run build --if-present
+          npm ci
-    - name: Test
+          npm run build --if-present
-      run: |
+      - name: Test
-        npm test
+        run: |
+          npm test

.gitignore

@@ -47,6 +47,7 @@ db.sqlite3-journal
 # React
 .DS_*
 *.log
+*.tsbuildinfo
 logs
 **/*.backup.*
 **/*.back.*

.vscode/settings.json

@@ -11,7 +11,9 @@
     "--multi-line",
     "3",
     "--project",
-    "apps"
+    "apps",
+    "--project",
+    "shared"
   ],
   "autopep8.args": [
     "--max-line-length",
@@ -38,6 +40,10 @@
     {
       "name": "django",
       "depth": 5
+    },
+    {
+      "name": "djangorestframework",
+      "depth": 2
     }
   ],
   "colorize.include": [".tsx", ".jsx", ".ts", ".js"],

README.md

@@ -69,6 +69,7 @@ This readme file is used mostly to document project dependencies
   - Backticks
   - Svg Preview
   - TODO Highlight v2
+  - Prettier
   </pre>
 </details>
 <details>
@@ -114,8 +115,10 @@ This readme file is used mostly to document project dependencies
   <pre>
   - Pylance
   - Pylint
-  - Django
   - autopep8
+  - isort
+  - Django
+  - SQLite
   </pre>
 </details>
 

TODO.txt

@@ -11,7 +11,7 @@ For more specific TODOs see comments in code
 [Functionality - PENDING]
 - Search functionality for manuals
 - User notifications on edit - consider spam prevention and change aggregation
-- Static analyzer for RSForm
+- Static analyzer for RSForm as a whole: check term duplication and empty conventions
 - Content based search in Library
 - User profile: Settings + settings persistency
 
@@ -25,12 +25,18 @@ For more specific TODOs see comments in code
 - Internationalization - at least english version. Consider react.intl
 - Focus on codemirror editor when label is clicked (need React 19 ref for clean code solution)
 
+- Sitemap for better SEO and crawler optimization
+
 
 [Tech]
-- add debounce to some search fields
 - duplicate syntax parsing and type info calculations to client. Consider moving backend to Nodejs or embedding c++ lib
-
+- add debounce to some search fields
 - DataTable: fixed percentage columns, especially for SubstituteTable. Rework column sizing mechanics
+- move autopep8 and isort settings from vscode settings to pyproject.toml
+- Test UI for #enable-force-dark Chrome setting
+
+- Testing: frontend react components, testplane / playwright?
+- Documentation: frontend base components at least
 
 
 [Deployment]
@@ -39,7 +45,6 @@ For more specific TODOs see comments in code
 
 
 [Security]
-- password-reset leaks info of email being used
 - improve nginx config. Consider DDOS and other types of attacks on infrastructure
 - recaptcha for create user and rest password
 https://yandex.cloud/ru/docs/smartcaptcha
@@ -50,9 +55,17 @@ Research and consider integration
 - django-allauth - consider supporting popular auth providers
 - drf-messages
 
+- skeleton loading
+https://react.dev/reference/react/Suspense
+
 - backend error message unification
 https://drf-standardized-errors.readthedocs.io/en/latest/error_response.html
 
+- semantic json diff
+https://stackoverflow.com/questions/28838170/multilevel-json-diff-in-python
+
+- Documentation platform. Consider diplodoc
+
 - radix-ui
 - shadcn-ui
 
@@ -60,6 +73,4 @@ https://drf-standardized-errors.readthedocs.io/en/latest/error_response.html
 - use-debounce
 
 - react-query
-- react-hook-form
+- react-hook-form
-
-- node-based UI

rsconcept/backend/Dockerfile

@@ -1,7 +1,7 @@
 # ==========================================
 # ============ Multi-stage build ===========
 # ==========================================
-FROM ubuntu:jammy as python-base
+FROM ubuntu:jammy AS python-base
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -25,7 +25,7 @@ RUN apt-get update -qq && \
     rm -rf /var/lib/apt/lists/*
 
 # ========= Builder ==============
-FROM python-base as builder
+FROM python-base AS builder
 
 # Set env variables
 ENV PYTHONDONTWRITEBYTECODE 1
@@ -65,9 +65,10 @@ RUN pip install --no-cache /wheels/* && \
     rm -rf /wheels
 
 # Copy application sources and setup permissions
-COPY apps/ ./apps
 COPY project/ ./project
+COPY shared/ ./shared
 COPY fixtures/ ./fixtures
+COPY apps/ ./apps
 COPY manage.py entrypoint.sh ./
 RUN sed -i 's/\r$//g'  $APP_HOME/entrypoint.sh && \
     chmod +x $APP_HOME/entrypoint.sh && \

rsconcept/backend/apps/oss/admin.py

@@ -0,0 +1,14 @@
+''' Admin view: OperationSchema. '''
+from django.contrib import admin
+
+from . import models
+
+
+class OperationAdmin(admin.ModelAdmin):
+    ''' Admin model: Operation. '''
+    ordering = ['oss']
+    list_display = ['oss', 'operation_type', 'result', 'alias', 'title', 'comment', 'position_x', 'position_y']
+    search_fields = ['operation_type', 'title', 'alias']
+
+
+admin.site.register(models.Operation, OperationAdmin)

rsconcept/backend/apps/oss/apps.py

@@ -0,0 +1,8 @@
+''' Application: Operation Schema. '''
+from django.apps import AppConfig
+
+
+class RsformConfig(AppConfig):
+    ''' Application config. '''
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'apps.oss'

rsconcept/backend/apps/oss/migrations/0001_initial.py

@@ -0,0 +1,69 @@
+# Generated by Django 5.0.7 on 2024-07-17 09:51
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('rsform', '0008_alter_libraryitem_item_type'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Operation',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('operation_type', models.CharField(choices=[
+                 ('input', 'Input'), ('synthesis', 'Synthesis')], default='input', max_length=10, verbose_name='Тип')),
+                ('alias', models.CharField(blank=True, max_length=255, verbose_name='Шифр')),
+                ('title', models.TextField(blank=True, verbose_name='Название')),
+                ('comment', models.TextField(blank=True, verbose_name='Комментарий')),
+                ('position_x', models.FloatField(default=0, verbose_name='Положение по горизонтали')),
+                ('position_y', models.FloatField(default=0, verbose_name='Положение по вертикали')),
+                ('oss', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
+                 related_name='items', to='rsform.libraryitem', verbose_name='Схема синтеза')),
+                ('result', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL,
+                 related_name='producer', to='rsform.libraryitem', verbose_name='Связанная КС')),
+            ],
+            options={
+                'verbose_name': 'Операция',
+                'verbose_name_plural': 'Операции',
+            },
+        ),
+        migrations.CreateModel(
+            name='SynthesisSubstitution',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('transfer_term', models.BooleanField(default=False, verbose_name='Перенос термина')),
+                ('operation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
+                 to='oss.operation', verbose_name='Операция')),
+                ('original', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
+                 related_name='as_original', to='rsform.constituenta', verbose_name='Удаляемая конституента')),
+                ('substitution', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
+                 related_name='as_substitute', to='rsform.constituenta', verbose_name='Замещающая конституента')),
+            ],
+            options={
+                'verbose_name': 'Отождествление синтеза',
+                'verbose_name_plural': 'Таблицы отождествлений',
+            },
+        ),
+        migrations.CreateModel(
+            name='Argument',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('argument', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
+                 related_name='descendants', to='oss.operation', verbose_name='Аргумент')),
+                ('operation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
+                 related_name='arguments', to='oss.operation', verbose_name='Операция')),
+            ],
+            options={
+                'verbose_name': 'Аргумент',
+                'verbose_name_plural': 'Аргументы операций',
+                'unique_together': {('operation', 'argument')},
+            },
+        ),
+    ]

rsconcept/backend/apps/oss/models/Argument.py

@@ -0,0 +1,27 @@
+''' Models: Operation Argument in OSS. '''
+from django.db.models import CASCADE, ForeignKey, Model
+
+
+class Argument(Model):
+    ''' Operation Argument.'''
+    operation: ForeignKey = ForeignKey(
+        verbose_name='Операция',
+        to='oss.Operation',
+        on_delete=CASCADE,
+        related_name='arguments'
+    )
+    argument: ForeignKey = ForeignKey(
+        verbose_name='Аргумент',
+        to='oss.Operation',
+        on_delete=CASCADE,
+        related_name='descendants'
+    )
+
+    class Meta:
+        ''' Model metadata. '''
+        verbose_name = 'Аргумент'
+        verbose_name_plural = 'Аргументы операций'
+        unique_together = [['operation', 'argument']]
+
+    def __str__(self) -> str:
+        return f'{self.argument.pk} -> {self.operation.pk}'

rsconcept/backend/apps/oss/models/Operation.py

@@ -0,0 +1,71 @@
+''' Models: Operation in OSS. '''
+from django.db.models import (
+    CASCADE,
+    SET_NULL,
+    CharField,
+    FloatField,
+    ForeignKey,
+    Model,
+    TextChoices,
+    TextField
+)
+
+
+class OperationType(TextChoices):
+    ''' Type of operation. '''
+    INPUT = 'input'
+    SYNTHESIS = 'synthesis'
+
+
+class Operation(Model):
+    ''' Operational schema Unit.'''
+    oss: ForeignKey = ForeignKey(
+        verbose_name='Схема синтеза',
+        to='rsform.LibraryItem',
+        on_delete=CASCADE,
+        related_name='items'
+    )
+    operation_type: CharField = CharField(
+        verbose_name='Тип',
+        max_length=10,
+        choices=OperationType.choices,
+        default=OperationType.INPUT
+    )
+    result: ForeignKey = ForeignKey(
+        verbose_name='Связанная КС',
+        to='rsform.LibraryItem',
+        null=True,
+        on_delete=SET_NULL,
+        related_name='producer'
+    )
+
+    alias: CharField = CharField(
+        verbose_name='Шифр',
+        max_length=255,
+        blank=True
+    )
+    title: TextField = TextField(
+        verbose_name='Название',
+        blank=True
+    )
+    comment: TextField = TextField(
+        verbose_name='Комментарий',
+        blank=True
+    )
+
+    position_x: FloatField = FloatField(
+        verbose_name='Положение по горизонтали',
+        default=0
+    )
+    position_y: FloatField = FloatField(
+        verbose_name='Положение по вертикали',
+        default=0
+    )
+
+    class Meta:
+        ''' Model metadata. '''
+        verbose_name = 'Операция'
+        verbose_name_plural = 'Операции'
+
+    def __str__(self) -> str:
+        return f'Операция {self.alias}'

rsconcept/backend/apps/oss/models/SynthesisSubstitution.py

@@ -0,0 +1,36 @@
+''' Models: SynthesisSubstitution. '''
+from django.db.models import CASCADE, BooleanField, ForeignKey, Model
+
+
+class SynthesisSubstitution(Model):
+    ''' Substitutions as part of Synthesis operation in OSS.'''
+    operation: ForeignKey = ForeignKey(
+        verbose_name='Операция',
+        to='oss.Operation',
+        on_delete=CASCADE
+    )
+
+    original: ForeignKey = ForeignKey(
+        verbose_name='Удаляемая конституента',
+        to='rsform.Constituenta',
+        on_delete=CASCADE,
+        related_name='as_original'
+    )
+    substitution: ForeignKey = ForeignKey(
+        verbose_name='Замещающая конституента',
+        to='rsform.Constituenta',
+        on_delete=CASCADE,
+        related_name='as_substitute'
+    )
+    transfer_term: BooleanField = BooleanField(
+        verbose_name='Перенос термина',
+        default=False
+    )
+
+    class Meta:
+        ''' Model metadata. '''
+        verbose_name = 'Отождествление синтеза'
+        verbose_name_plural = 'Таблицы отождествлений'
+
+    def __str__(self) -> str:
+        return f'{self.original.pk} -> {self.substitution.pk}'

rsconcept/backend/apps/oss/models/__init__.py

@@ -0,0 +1,8 @@
+''' Django: Models. '''
+
+from apps.rsform.models import LibraryItem, LibraryItemType
+
+from .api_OSS import OperationSchema
+from .Argument import Argument
+from .Operation import Operation, OperationType
+from .SynthesisSubstitution import SynthesisSubstitution

rsconcept/backend/apps/oss/models/api_OSS.py

@@ -0,0 +1,128 @@
+''' Models: OSS API. '''
+from typing import Optional
+
+from django.core.exceptions import ValidationError
+from django.db import transaction
+from django.db.models import QuerySet
+
+from apps.rsform.models import LibraryItem, LibraryItemType
+from shared import messages as msg
+
+from .Argument import Argument
+from .Operation import Operation
+from .SynthesisSubstitution import SynthesisSubstitution
+
+
+class OperationSchema:
+    ''' Operations schema API. '''
+
+    def __init__(self, item: LibraryItem):
+        if item.item_type != LibraryItemType.OPERATION_SCHEMA:
+            raise ValueError(msg.libraryTypeUnexpected())
+        self.item = item
+
+    @staticmethod
+    def create(**kwargs) -> 'OperationSchema':
+        item = LibraryItem.objects.create(item_type=LibraryItemType.OPERATION_SCHEMA, **kwargs)
+        return OperationSchema(item=item)
+
+    def operations(self) -> QuerySet[Operation]:
+        ''' Get QuerySet containing all operations of current OSS. '''
+        return Operation.objects.filter(oss=self.item)
+
+    def arguments(self) -> QuerySet[Argument]:
+        ''' Operation arguments. '''
+        return Argument.objects.filter(operation__oss=self.item)
+
+    def substitutions(self) -> QuerySet[SynthesisSubstitution]:
+        ''' Operation substitutions. '''
+        return SynthesisSubstitution.objects.filter(operation__oss=self.item)
+
+    def update_positions(self, data: list[dict]):
+        ''' Update positions. '''
+        lookup = {x['id']: x for x in data}
+        operations = self.operations()
+        for item in operations:
+            if item.pk in lookup:
+                item.position_x = lookup[item.pk]['position_x']
+                item.position_y = lookup[item.pk]['position_y']
+        Operation.objects.bulk_update(operations, ['position_x', 'position_y'])
+
+    @transaction.atomic
+    def create_operation(self, **kwargs) -> Operation:
+        ''' Insert new operation. '''
+        if kwargs['alias'] != '' and self.operations().filter(alias=kwargs['alias']).exists():
+            raise ValidationError(msg.aliasTaken(kwargs['alias']))
+        result = Operation.objects.create(
+            oss=self.item,
+            **kwargs
+        )
+        self.item.save()
+        result.refresh_from_db()
+        return result
+
+    @transaction.atomic
+    def delete_operation(self, operation: Operation):
+        ''' Delete operation. '''
+        operation.delete()
+
+        # deal with attached schema
+        # trigger on_change effects
+
+        self.item.save()
+
+    @transaction.atomic
+    def set_input(self, target: Operation, schema: Optional[LibraryItem]):
+        ''' Set input schema for operation. '''
+        if schema == target.result:
+            return
+        if schema:
+            target.result = schema
+            target.alias = schema.alias
+            target.title = schema.title
+            target.comment = schema.comment
+        else:
+            target.result = None
+        target.save()
+
+        # trigger on_change effects
+
+        self.item.save()
+
+    @transaction.atomic
+    def add_argument(self, operation: Operation, argument: Operation) -> Optional[Argument]:
+        ''' Add Argument to operation. '''
+        if Argument.objects.filter(operation=operation, argument=argument).exists():
+            return None
+        result = Argument.objects.create(operation=operation, argument=argument)
+        self.item.save()
+        return result
+
+    @transaction.atomic
+    def clear_arguments(self, target: Operation):
+        ''' Clear all arguments for operation. '''
+        if not Argument.objects.filter(operation=target).exists():
+            return
+
+        Argument.objects.filter(operation=target).delete()
+        SynthesisSubstitution.objects.filter(operation=target).delete()
+
+        # trigger on_change effects
+
+        self.item.save()
+
+    @transaction.atomic
+    def set_substitutions(self, target: Operation, substitutes: list[dict]):
+        ''' Clear all arguments for operation. '''
+        SynthesisSubstitution.objects.filter(operation=target).delete()
+        for sub in substitutes:
+            SynthesisSubstitution.objects.create(
+                operation=target,
+                original=sub['original'],
+                substitution=sub['substitution'],
+                transfer_term=sub['transfer_term']
+            )
+
+        # trigger on_change effects
+
+        self.item.save()

rsconcept/backend/apps/oss/serializers/__init__.py

@@ -0,0 +1,13 @@
+''' REST API: Serializers. '''
+
+from apps.rsform.serializers import LibraryItemSerializer
+
+from .basics import OperationPositionSerializer, PositionsSerializer
+from .data_access import (
+    ArgumentSerializer,
+    OperationCreateSerializer,
+    OperationDeleteSerializer,
+    OperationSchemaSerializer,
+    OperationSerializer
+)
+from .schema_typing import NewOperationResponse

rsconcept/backend/apps/oss/serializers/basics.py

@@ -0,0 +1,16 @@
+''' Basic serializers that do not interact with database. '''
+from rest_framework import serializers
+
+
+class OperationPositionSerializer(serializers.Serializer):
+    ''' Operation position. '''
+    id = serializers.IntegerField()
+    position_x = serializers.FloatField()
+    position_y = serializers.FloatField()
+
+
+class PositionsSerializer(serializers.Serializer):
+    ''' Operations position for OperationSchema. '''
+    positions = serializers.ListField(
+        child=OperationPositionSerializer()
+    )

rsconcept/backend/apps/oss/serializers/data_access.py

@@ -0,0 +1,108 @@
+''' Serializers for persistent data manipulation. '''
+from typing import cast
+
+from django.db.models import F
+from rest_framework import serializers
+from rest_framework.serializers import PrimaryKeyRelatedField as PKField
+
+from apps.rsform.models import LibraryItem
+from apps.rsform.serializers import LibraryItemDetailsSerializer
+from shared import messages as msg
+
+from ..models import Argument, Operation, OperationSchema, OperationType
+from .basics import OperationPositionSerializer
+
+
+class OperationSerializer(serializers.ModelSerializer):
+    ''' Serializer: Operation data. '''
+    class Meta:
+        ''' serializer metadata. '''
+        model = Operation
+        fields = '__all__'
+        read_only_fields = ('id', 'oss')
+
+
+class ArgumentSerializer(serializers.ModelSerializer):
+    ''' Serializer: Operation data. '''
+    class Meta:
+        ''' serializer metadata. '''
+        model = Argument
+        fields = ('operation', 'argument')
+
+
+class OperationCreateSerializer(serializers.Serializer):
+    ''' Serializer: Operation creation. '''
+    class OperationData(serializers.ModelSerializer):
+        ''' Serializer: Operation creation data. '''
+        alias = serializers.CharField()
+        operation_type = serializers.ChoiceField(OperationType.choices)
+
+        class Meta:
+            ''' serializer metadata. '''
+            model = Operation
+            fields = \
+                'alias', 'operation_type', 'title', \
+                'comment', 'position_x', 'position_y'
+
+    item_data = OperationData()
+    positions = serializers.ListField(
+        child=OperationPositionSerializer(),
+        default=[]
+    )
+
+
+class OperationDeleteSerializer(serializers.Serializer):
+    ''' Serializer: Delete operation. '''
+    target = PKField(many=False, queryset=Operation.objects.all())
+    positions = serializers.ListField(
+        child=OperationPositionSerializer(),
+        default=[]
+    )
+
+    def validate(self, attrs):
+        oss = cast(LibraryItem, self.context['oss'])
+        operation = cast(Operation, attrs['target'])
+        if oss and operation.oss != oss:
+            raise serializers.ValidationError({
+                f'{operation.id}': msg.operationNotOwned(oss.title)
+            })
+        self.instance = operation
+        return attrs
+
+
+class OperationSchemaSerializer(serializers.ModelSerializer):
+    ''' Serializer: Detailed data for OSS. '''
+    items = serializers.ListField(
+        child=OperationSerializer()
+    )
+    graph = serializers.ListField(
+        child=ArgumentSerializer()
+    )
+
+    class Meta:
+        ''' serializer metadata. '''
+        model = LibraryItem
+        fields = '__all__'
+
+    def to_representation(self, instance: LibraryItem):
+        result = LibraryItemDetailsSerializer(instance).data
+        oss = OperationSchema(instance)
+        result['items'] = []
+        for operation in oss.operations():
+            result['items'].append(OperationSerializer(operation).data)
+        result['graph'] = []
+        for argument in oss.arguments():
+            result['graph'].append(ArgumentSerializer(argument).data)
+        result['substitutions'] = []
+        for substitution in oss.substitutions().values(
+            'operation',
+            'original',
+            'transfer_term',
+            'substitution',
+            original_alias=F('original__alias'),
+            original_term=F('original__term_resolved'),
+            substitution_alias=F('substitution__alias'),
+            substitution_term=F('substitution__term_resolved'),
+        ):
+            result['substitutions'].append(substitution)
+        return result

rsconcept/backend/apps/oss/serializers/schema_typing.py

@@ -0,0 +1,10 @@
+''' Utility serializers for REST API schema - SHOULD NOT BE ACCESSED DIRECTLY. '''
+from rest_framework import serializers
+
+from .data_access import OperationSchemaSerializer, OperationSerializer
+
+
+class NewOperationResponse(serializers.Serializer):
+    ''' Serializer: Create operation response. '''
+    new_operation = OperationSerializer()
+    oss = OperationSchemaSerializer()

rsconcept/backend/apps/oss/tests/__init__.py

@@ -0,0 +1,3 @@
+''' Tests. '''
+from .s_models import *
+from .s_views import *

rsconcept/backend/apps/oss/tests/s_models/__init__.py

@@ -0,0 +1 @@
+''' Tests for Django Models. '''

rsconcept/backend/apps/oss/tests/s_views/__init__.py

@@ -0,0 +1,2 @@
+''' Tests for REST API. '''
+from .t_oss import *

rsconcept/backend/apps/oss/tests/s_views/t_oss.py

@@ -0,0 +1,189 @@
+''' Testing API: Operation Schema. '''
+
+from rest_framework import status
+
+from apps.oss.models import Operation, OperationSchema, OperationType
+from apps.rsform.models import AccessPolicy, LibraryItem, LibraryItemType, LocationHead, RSForm
+from shared.EndpointTester import EndpointTester, decl_endpoint
+
+
+class TestOssViewset(EndpointTester):
+    ''' Testing OSS view. '''
+
+    def setUp(self):
+        super().setUp()
+        self.owned = OperationSchema.create(title='Test', alias='T1', owner=self.user)
+        self.owned_id = self.owned.item.pk
+        self.unowned = OperationSchema.create(title='Test2', alias='T2')
+        self.unowned_id = self.unowned.item.pk
+        self.private = OperationSchema.create(title='Test2', alias='T2', access_policy=AccessPolicy.PRIVATE)
+        self.private_id = self.private.item.pk
+        self.invalid_id = self.private.item.pk + 1337
+
+
+    def populateData(self):
+        self.ks1 = RSForm.create(alias='KS1', title='Test1')
+        self.ks1x1 = self.ks1.insert_new('X1', term_resolved='X1_1')
+        self.ks2 = RSForm.create(alias='KS2', title='Test2')
+        self.ks2x1 = self.ks2.insert_new('X2', term_resolved='X1_2')
+        self.operation1 = self.owned.create_operation(
+            alias='1',
+            operation_type=OperationType.INPUT,
+            result=self.ks1.item
+        )
+        self.operation2 = self.owned.create_operation(
+            alias='2',
+            operation_type=OperationType.INPUT,
+            result=self.ks2.item
+        )
+        self.operation3 = self.owned.create_operation(
+            alias='3',
+            operation_type=OperationType.SYNTHESIS
+        )
+        self.owned.add_argument(self.operation3, self.operation1)
+        self.owned.add_argument(self.operation3, self.operation2)
+        self.owned.set_substitutions(self.operation3, [{
+            'original': self.ks1x1,
+            'substitution': self.ks2x1,
+            'transfer_term': False
+        }])
+
+    @decl_endpoint('/api/oss/{item}/details', method='get')
+    def test_details(self):
+        self.populateData()
+
+        response = self.executeOK(item=self.owned_id)
+        self.assertEqual(response.data['owner'], self.owned.item.owner.pk)
+        self.assertEqual(response.data['title'], self.owned.item.title)
+        self.assertEqual(response.data['alias'], self.owned.item.alias)
+        self.assertEqual(response.data['location'], self.owned.item.location)
+        self.assertEqual(response.data['access_policy'], self.owned.item.access_policy)
+        self.assertEqual(response.data['visible'], self.owned.item.visible)
+
+        self.assertEqual(response.data['item_type'], LibraryItemType.OPERATION_SCHEMA)
+
+        self.assertEqual(len(response.data['items']), 3)
+        self.assertEqual(response.data['items'][0]['id'], self.operation1.pk)
+        self.assertEqual(response.data['items'][0]['operation_type'], self.operation1.operation_type)
+
+        self.assertEqual(len(response.data['substitutions']), 1)
+        sub = response.data['substitutions'][0]
+        self.assertEqual(sub['operation'], self.operation3.pk)
+        self.assertEqual(sub['original'], self.ks1x1.pk)
+        self.assertEqual(sub['substitution'], self.ks2x1.pk)
+        self.assertEqual(sub['transfer_term'], False)
+        self.assertEqual(sub['original_alias'], self.ks1x1.alias)
+        self.assertEqual(sub['original_term'], self.ks1x1.term_resolved)
+        self.assertEqual(sub['substitution_alias'], self.ks2x1.alias)
+        self.assertEqual(sub['substitution_term'], self.ks2x1.term_resolved)
+
+        graph = response.data['graph']
+        self.assertEqual(len(graph), 2)
+        self.assertEqual(graph[0]['operation'], self.operation3.pk)
+        self.assertEqual(graph[0]['argument'], self.operation1.pk)
+        self.assertEqual(graph[1]['operation'], self.operation3.pk)
+        self.assertEqual(graph[1]['argument'], self.operation2.pk)
+
+        self.executeOK(item=self.unowned_id)
+        self.executeForbidden(item=self.private_id)
+
+        self.logout()
+        self.executeOK(item=self.owned_id)
+        self.executeOK(item=self.unowned_id)
+        self.executeForbidden(item=self.private_id)
+
+    @decl_endpoint('/api/oss/{item}/update-positions', method='patch')
+    def test_update_positions(self):
+        self.populateData()
+        self.executeBadData(item=self.owned_id)
+
+        data = {'positions': []}
+        self.executeOK(data=data)
+
+        data = {'positions': [
+            {'id': self.operation1.pk, 'position_x': 42.1, 'position_y': 1337},
+            {'id': self.operation2.pk, 'position_x': 36.1, 'position_y': 1437},
+            {'id': self.invalid_id, 'position_x': 31, 'position_y': 12},
+        ]}
+        self.toggle_admin(True)
+        self.executeOK(data=data, item=self.unowned_id)
+        self.operation1.refresh_from_db()
+        self.assertNotEqual(self.operation1.position_x, data['positions'][0]['position_x'])
+        self.assertNotEqual(self.operation1.position_y, data['positions'][0]['position_y'])
+
+        self.toggle_admin(False)
+        self.executeOK(data=data, item=self.owned_id)
+        self.operation1.refresh_from_db()
+        self.operation2.refresh_from_db()
+        self.assertEqual(self.operation1.position_x, data['positions'][0]['position_x'])
+        self.assertEqual(self.operation1.position_y, data['positions'][0]['position_y'])
+        self.assertEqual(self.operation2.position_x, data['positions'][1]['position_x'])
+        self.assertEqual(self.operation2.position_y, data['positions'][1]['position_y'])
+
+        self.executeForbidden(data=data, item=self.unowned_id)
+        self.executeForbidden(item=self.private_id)
+
+
+    @decl_endpoint('/api/oss/{item}/create-operation', method='post')
+    def test_create_operation(self):
+        self.executeNotFound(item=self.invalid_id)
+
+        self.populateData()
+        self.executeBadData(item=self.owned_id)
+
+        data = {
+            'item_data': {
+                'alias': 'Test3',
+                'title': 'Test title',
+                'comment': 'Тест кириллицы',
+                'position_x': 1,
+                'position_y': 1,
+            },
+            'positions': [
+                {'id': self.operation1.pk, 'position_x': 42.1, 'position_y': 1337}
+            ]
+        }
+        self.executeBadData(data=data)
+
+        data['item_data']['operation_type'] = 'invalid'
+        self.executeBadData(data=data)
+
+        data['item_data']['operation_type'] = OperationType.INPUT
+        response = self.executeCreated(data=data)
+        self.assertEqual(len(response.data['oss']['items']), 4)
+        new_operation = response.data['new_operation']
+        self.assertEqual(new_operation['alias'], data['item_data']['alias'])
+        self.assertEqual(new_operation['operation_type'], data['item_data']['operation_type'])
+        self.assertEqual(new_operation['title'], data['item_data']['title'])
+        self.assertEqual(new_operation['comment'], data['item_data']['comment'])
+        self.assertEqual(new_operation['position_x'], data['item_data']['position_x'])
+        self.assertEqual(new_operation['position_y'], data['item_data']['position_y'])
+        self.operation1.refresh_from_db()
+        self.assertEqual(self.operation1.position_x, data['positions'][0]['position_x'])
+        self.assertEqual(self.operation1.position_y, data['positions'][0]['position_y'])
+
+        self.executeForbidden(data=data, item=self.unowned_id)
+        self.toggle_admin(True)
+        self.executeCreated(data=data, item=self.unowned_id)
+
+    @decl_endpoint('/api/oss/{item}/delete-operation', method='patch')
+    def test_delete_operation(self):
+        self.executeNotFound(item=self.invalid_id)
+
+        self.populateData()
+        self.executeBadData(item=self.owned_id)
+
+        data = {
+            'positions': []
+        }
+        self.executeBadData(data=data)
+
+        data['target'] = self.operation1.pk
+        self.toggle_admin(True)
+        self.executeBadData(data=data, item=self.unowned_id)
+        self.logout()
+        self.executeForbidden(data=data, item=self.owned_id)
+
+        self.login()
+        response = self.executeOK(data=data)
+        self.assertEqual(len(response.data['items']), 2)

rsconcept/backend/apps/oss/urls.py

@@ -0,0 +1,12 @@
+''' Routing: Operation Schema. '''
+from django.urls import include, path
+from rest_framework import routers
+
+from . import views
+
+library_router = routers.SimpleRouter(trailing_slash=False)
+library_router.register('oss', views.OssViewSet, 'OSS')
+
+urlpatterns = [
+    path('', include(library_router.urls)),
+]

rsconcept/backend/apps/oss/views/__init__.py

@@ -0,0 +1,2 @@
+''' REST API: Endpoint processors. '''
+from .oss import OssViewSet

rsconcept/backend/apps/oss/views/oss.py

@@ -0,0 +1,141 @@
+''' Endpoints for OSS. '''
+from typing import cast
+
+from django.db import transaction
+from drf_spectacular.utils import extend_schema, extend_schema_view
+from rest_framework import generics
+from rest_framework import status as c
+from rest_framework import viewsets
+from rest_framework.decorators import action
+from rest_framework.request import Request
+from rest_framework.response import Response
+
+from shared import permissions
+
+from .. import models as m
+from .. import serializers as s
+
+
+@extend_schema(tags=['OSS'])
+@extend_schema_view()
+class OssViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.RetrieveAPIView):
+    ''' Endpoint: OperationSchema. '''
+    queryset = m.LibraryItem.objects.filter(item_type=m.LibraryItemType.OPERATION_SCHEMA)
+    serializer_class = s.LibraryItemSerializer
+
+    def _get_schema(self) -> m.OperationSchema:
+        return m.OperationSchema(cast(m.LibraryItem, self.get_object()))
+
+    def get_permissions(self):
+        ''' Determine permission class. '''
+        if self.action in [
+            'create_operation',
+            'delete_operation',
+            'update_positions'
+        ]:
+            permission_list = [permissions.ItemEditor]
+        elif self.action in ['details']:
+            permission_list = [permissions.ItemAnyone]
+        else:
+            permission_list = [permissions.Anyone]
+        return [permission() for permission in permission_list]
+
+    @extend_schema(
+        summary='get operations data',
+        tags=['OSS'],
+        request=None,
+        responses={
+            c.HTTP_200_OK: s.OperationSchemaSerializer,
+            c.HTTP_404_NOT_FOUND: None
+        }
+    )
+    @action(detail=True, methods=['get'], url_path='details')
+    def details(self, request: Request, pk):
+        ''' Endpoint: Detailed OSS data. '''
+        serializer = s.OperationSchemaSerializer(cast(m.LibraryItem, self.get_object()))
+        return Response(
+            status=c.HTTP_200_OK,
+            data=serializer.data
+        )
+
+    @extend_schema(
+        summary='update positions',
+        tags=['OSS'],
+        request=s.PositionsSerializer,
+        responses={
+            c.HTTP_200_OK: None,
+            c.HTTP_403_FORBIDDEN: None,
+            c.HTTP_404_NOT_FOUND: None
+        }
+    )
+    @action(detail=True, methods=['patch'], url_path='update-positions')
+    def update_positions(self, request: Request, pk):
+        ''' Endpoint: Update operations positions. '''
+        schema = self._get_schema()
+        serializer = s.PositionsSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        schema.update_positions(serializer.validated_data['positions'])
+        return Response(status=c.HTTP_200_OK)
+
+    @extend_schema(
+        summary='create operation',
+        tags=['OSS'],
+        request=s.OperationCreateSerializer(),
+        responses={
+            c.HTTP_201_CREATED: s.NewOperationResponse,
+            c.HTTP_400_BAD_REQUEST: None,
+            c.HTTP_403_FORBIDDEN: None,
+            c.HTTP_404_NOT_FOUND: None
+        }
+    )
+    @action(detail=True, methods=['post'], url_path='create-operation')
+    def create_operation(self, request: Request, pk):
+        ''' Create new operation. '''
+        schema = self._get_schema()
+        serializer = s.OperationCreateSerializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+
+        with transaction.atomic():
+            schema.update_positions(serializer.validated_data['positions'])
+            new_operation = schema.create_operation(**serializer.validated_data['item_data'])
+            schema.item.refresh_from_db()
+
+        response = Response(
+            status=c.HTTP_201_CREATED,
+            data={
+                'new_operation': s.OperationSerializer(new_operation).data,
+                'oss': s.OperationSchemaSerializer(schema.item).data
+            }
+        )
+        return response
+
+    @extend_schema(
+        summary='delete operation',
+        tags=['OSS'],
+        request=s.OperationDeleteSerializer,
+        responses={
+            c.HTTP_200_OK: s.OperationSchemaSerializer,
+            c.HTTP_400_BAD_REQUEST: None,
+            c.HTTP_403_FORBIDDEN: None,
+            c.HTTP_404_NOT_FOUND: None
+        }
+    )
+    @action(detail=True, methods=['patch'], url_path='delete-operation')
+    def delete_operation(self, request: Request, pk):
+        ''' Endpoint: Delete operation. '''
+        schema = self._get_schema()
+        serializer = s.OperationDeleteSerializer(
+            data=request.data,
+            context={'oss': schema.item}
+        )
+        serializer.is_valid(raise_exception=True)
+
+        with transaction.atomic():
+            schema.update_positions(serializer.validated_data['positions'])
+            schema.delete_operation(serializer.validated_data['target'])
+            schema.item.refresh_from_db()
+
+        return Response(
+            status=c.HTTP_200_OK,
+            data=s.OperationSchemaSerializer(schema.item).data
+        )

rsconcept/backend/apps/rsform/graph.py

@@ -91,7 +91,7 @@ class Graph(Generic[ItemType]):
             if len(self.inputs[node_id]) == 0:
                 continue
             for parent in self.inputs[node_id]:
-                result[parent] = result[parent] + [id for id in result[node_id] if not id in result[parent]]
+                result[parent] = result[parent] + [id for id in result[node_id] if id not in result[parent]]
         return result
 
     def topological_order(self) -> list[ItemType]:

rsconcept/backend/apps/rsform/migrations/0008_alter_libraryitem_item_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.7 on 2024-07-17 09:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rsform', '0007_location_and_flags'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='libraryitem',
+            name='item_type',
+            field=models.CharField(choices=[('rsform', 'Rsform'), ('oss', 'Operation Schema')], max_length=50, verbose_name='Тип'),
+        ),
+    ]

rsconcept/backend/apps/rsform/models/Editor.py

@@ -60,12 +60,12 @@ class Editor(Model):
         ''' Set editors for item. '''
         processed: list[User] = []
         for editor_item in Editor.objects.filter(item=item):
-            if not editor_item.editor in users:
+            if editor_item.editor not in users:
                 editor_item.delete()
             else:
                 processed.append(editor_item.editor)
 
         for user in users:
-            if not user in processed:
+            if user not in processed:
                 processed.append(user)
                 Editor.objects.create(item=item, editor=user)

rsconcept/backend/apps/rsform/models/LibraryItem.py

@@ -9,6 +9,7 @@ from django.db.models import (
     DateTimeField,
     ForeignKey,
     Model,
+    QuerySet,
     TextChoices,
     TextField
 )
@@ -23,7 +24,7 @@ from .Version import Version
 class LibraryItemType(TextChoices):
     ''' Type of library items '''
     RSFORM = 'rsform'
-    OPERATIONS_SCHEMA = 'oss'
+    OPERATION_SCHEMA = 'oss'
 
 
 class AccessPolicy(TextChoices):
@@ -113,17 +114,17 @@ class LibraryItem(Model):
     def get_absolute_url(self):
         return f'/api/library/{self.pk}'
 
-    def subscribers(self) -> list[Subscription]:
+    def subscribers(self) -> list[User]:
         ''' Get all subscribers for this item. '''
-        return [subscription.user for subscription in Subscription.objects.filter(item=self.pk)]
+        return [subscription.user for subscription in Subscription.objects.filter(item=self.pk).only('user')]
 
-    def versions(self) -> list[Version]:
+    def editors(self) -> list[User]:
-        ''' Get all Versions of this item. '''
-        return list(Version.objects.filter(item=self.pk).order_by('-time_create'))
-
-    def editors(self) -> list[Editor]:
         ''' Get all Editors of this item. '''
-        return [item.editor for item in Editor.objects.filter(item=self.pk)]
+        return [item.editor for item in Editor.objects.filter(item=self.pk).only('editor')]
+
+    def versions(self) -> QuerySet[Version]:
+        ''' Get all Versions of this item. '''
+        return Version.objects.filter(item=self.pk).order_by('-time_create')
 
     @transaction.atomic
     def save(self, *args, **kwargs):

rsconcept/backend/apps/rsform/models/api_RSForm.py

@@ -1,13 +1,14 @@
 ''' Models: RSForm API. '''
 from copy import deepcopy
-from typing import Optional, Union, cast
+from typing import Optional, cast
 
 from cctext import Entity, Resolver, TermForm, extract_entities, split_grams
 from django.core.exceptions import ValidationError
 from django.db import transaction
 from django.db.models import QuerySet
 
-from .. import messages as msg
+from shared import messages as msg
+
 from ..graph import Graph
 from .api_RSLanguage import (
     extract_globals,
@@ -39,7 +40,7 @@ class RSForm:
     def create(**kwargs) -> 'RSForm':
         return RSForm(LibraryItem.objects.create(item_type=LibraryItemType.RSFORM, **kwargs))
 
-    def constituents(self) -> QuerySet['Constituenta']:
+    def constituents(self) -> QuerySet[Constituenta]:
         ''' Get QuerySet containing all constituents of current RSForm. '''
         return Constituenta.objects.filter(schema=self.item)
 
@@ -104,11 +105,39 @@ class RSForm:
             result = max(result, int(alias[1:]))
         return result
 
+    @transaction.atomic
+    def create_cst(self, data: dict, insert_after: Optional[Constituenta] = None) -> Constituenta:
+        ''' Create new cst from data. '''
+        if insert_after is None:
+            position = _INSERT_LAST
+        else:
+            position = insert_after.order + 1
+        result = self.insert_new(data['alias'], data['cst_type'], position)
+        result.convention = data.get('convention', '')
+        result.definition_formal = data.get('definition_formal', '')
+        result.term_forms = data.get('term_forms', [])
+        result.term_raw = data.get('term_raw', '')
+        result.definition_raw = data.get('definition_raw', '')
+
+        if result.term_raw != '' or result.definition_raw != '':
+            resolver = self.resolver()
+            if result.term_raw != '':
+                resolved = resolver.resolve(result.term_raw)
+                result.term_resolved = resolved
+                resolver.context[result.alias] = Entity(result.alias, resolved)
+            if result.definition_raw != '':
+                result.definition_resolved = resolver.resolve(result.definition_raw)
+
+        result.save()
+        self.on_term_change([result.id])
+        result.refresh_from_db()
+        return result
+
     @transaction.atomic
     def insert_new(
         self,
         alias: str,
-        cst_type: Union[CstType, None] = None,
+        cst_type: Optional[CstType] = None,
         position: int = _INSERT_LAST,
         **kwargs
     ) -> Constituenta:
@@ -195,27 +224,6 @@ class RSForm:
         self.resolve_all_text()
         self.item.save()
 
-    @transaction.atomic
-    def create_cst(self, data: dict, insert_after: Optional[str] = None) -> Constituenta:
-        ''' Create new cst from data. '''
-        resolver = self.resolver()
-        cst = self._insert_new(data, insert_after)
-        cst.convention = data.get('convention', '')
-        cst.definition_formal = data.get('definition_formal', '')
-        cst.term_forms = data.get('term_forms', [])
-        cst.term_raw = data.get('term_raw', '')
-        if cst.term_raw != '':
-            resolved = resolver.resolve(cst.term_raw)
-            cst.term_resolved = resolved
-            resolver.context[cst.alias] = Entity(cst.alias, resolved)
-        cst.definition_raw = data.get('definition_raw', '')
-        if cst.definition_raw != '':
-            cst.definition_resolved = resolver.resolve(cst.definition_raw)
-        cst.save()
-        self.on_term_change([cst.id])
-        cst.refresh_from_db()
-        return cst
-
     @transaction.atomic
     def substitute(
         self,
@@ -363,13 +371,6 @@ class RSForm:
                 cst.save()
             order += 1
 
-    def _insert_new(self, data: dict, insert_after: Optional[str] = None) -> Constituenta:
-        if insert_after is not None:
-            cst_after = Constituenta.objects.get(pk=insert_after)
-            return self.insert_new(data['alias'], data['cst_type'], cst_after.order + 1)
-        else:
-            return self.insert_new(data['alias'], data['cst_type'])
-
     def _graph_formal(self) -> Graph[int]:
         ''' Graph based on formal definitions. '''
         result: Graph[int] = Graph()

rsconcept/backend/apps/rsform/models/api_RSLanguage.py

@@ -6,7 +6,8 @@ from typing import Set, Tuple, cast
 
 import pyconcept
 
-from .. import messages as msg
+from shared import messages as msg
+
 from .Constituenta import CstType
 
 _RE_GLOBALS = r'[XCSADFPT]\d+'  # cspell:disable-line

rsconcept/backend/apps/rsform/serializers/__init__.py

@@ -22,6 +22,7 @@ from .data_access import (
     InlineSynthesisSerializer,
     LibraryItemBaseSerializer,
     LibraryItemCloneSerializer,
+    LibraryItemDetailsSerializer,
     LibraryItemSerializer,
     RSFormParseSerializer,
     RSFormSerializer,

rsconcept/backend/apps/rsform/serializers/basics.py

@@ -4,7 +4,8 @@ from typing import cast
 from cctext import EntityReference, Reference, ReferenceType, Resolver, SyntacticReference
 from rest_framework import serializers
 
-from .. import messages as msg
+from shared import messages as msg
+
 from ..models import AccessPolicy, validate_location
 
 
@@ -34,7 +35,7 @@ class LocationSerializer(serializers.Serializer):
 
 class AccessPolicySerializer(serializers.Serializer):
     ''' Serializer: Constituenta renaming. '''
-    access_policy = serializers.CharField(max_length=500)
+    access_policy = serializers.CharField()
 
     def validate(self, attrs):
         attrs = super().validate(attrs)

rsconcept/backend/apps/rsform/serializers/data_access.py

@@ -7,7 +7,8 @@ from django.db import transaction
 from rest_framework import serializers
 from rest_framework.serializers import PrimaryKeyRelatedField as PKField
 
-from .. import messages as msg
+from shared import messages as msg
+
 from ..models import Constituenta, CstType, LibraryItem, RSForm, Version
 from .basics import CstParseSerializer
 from .io_pyconcept import PyConceptAdapter
@@ -140,6 +141,8 @@ class CstDetailsSerializer(serializers.ModelSerializer):
 class CstCreateSerializer(serializers.ModelSerializer):
     ''' Serializer: Constituenta creation. '''
     insert_after = serializers.IntegerField(required=False, allow_null=True)
+    alias = serializers.CharField(max_length=8)
+    cst_type = serializers.ChoiceField(CstType.choices)
 
     class Meta:
         ''' serializer metadata. '''

rsconcept/backend/apps/rsform/serializers/io_files.py

@@ -2,7 +2,8 @@
 from django.db import transaction
 from rest_framework import serializers
 
-from .. import messages as msg
+from shared import messages as msg
+
 from ..models import Constituenta, LibraryItem, RSForm
 from ..utils import fix_old_references
 

rsconcept/backend/apps/rsform/serializers/io_pyconcept.py

@@ -4,7 +4,8 @@ from typing import Optional, Union, cast
 
 import pyconcept
 
-from .. import messages as msg
+from shared import messages as msg
+
 from ..models import RSForm
 
 

rsconcept/backend/apps/rsform/tests/__init__.py

@@ -1,5 +1,5 @@
 ''' Tests. '''
-from .s_models.t_RSForm import *
+from .s_models import *
 from .s_views import *
 from .t_graph import *
 from .t_imports import *

rsconcept/backend/apps/rsform/tests/s_models/__init__.py

@@ -1,4 +1,4 @@
-''' Tests for REST API. '''
+''' Tests for Django Models. '''
 from .t_Constituenta import *
 from .t_Editor import *
 from .t_LibraryItem import *

rsconcept/backend/apps/rsform/tests/s_models/t_RSForm.py

@@ -101,6 +101,26 @@ class TestRSForm(TestCase):
         self.assertEqual(x2.schema, self.schema.item)
         self.assertEqual(x1.order, 1)
 
+    def test_create_cst(self):
+        data = {
+            'alias': 'X3',
+            'cst_type': CstType.BASE,
+            'term_raw': 'слон',
+            'definition_raw': 'test',
+            'convention': 'convention'
+        }
+
+        x1 = self.schema.insert_new('X1')
+        x2 = self.schema.insert_new('X2')
+        x3 = self.schema.create_cst(data=data, insert_after=x1)
+        x2.refresh_from_db()
+
+        self.assertEqual(x3.alias, data['alias'])
+        self.assertEqual(x3.term_raw, data['term_raw'])
+        self.assertEqual(x3.definition_raw, data['definition_raw'])
+        self.assertEqual(x2.order, 3)
+        self.assertEqual(x3.order, 2)
+
 
     def test_create_cst_resolve(self):
         x1 = self.schema.insert_new(

rsconcept/backend/apps/rsform/tests/s_views/t_cctext.py

@@ -1,7 +1,7 @@
 ''' Testing views '''
 from cctext import split_grams
 
-from ..EndpointTester import EndpointTester, decl_endpoint
+from shared.EndpointTester import EndpointTester, decl_endpoint
 
 
 class TestNaturalLanguageViews(EndpointTester):
@@ -14,20 +14,20 @@ class TestNaturalLanguageViews(EndpointTester):
     @decl_endpoint(endpoint='/api/cctext/parse', method='post')
     def test_parse_text(self):
         data = {'text': 'синим слонам'}
-        response = self.executeOK(data)
+        response = self.executeOK(data=data)
         self._assert_tags(response.data['result'], 'datv,NOUN,plur,anim,masc')
 
 
     @decl_endpoint(endpoint='/api/cctext/inflect', method='post')
     def test_inflect(self):
         data = {'text': 'синий слон', 'grams': 'plur,datv'}
-        response = self.executeOK(data)
+        response = self.executeOK(data=data)
         self.assertEqual(response.data['result'], 'синим слонам')
 
 
     @decl_endpoint(endpoint='/api/cctext/generate-lexeme', method='post')
     def test_generate_lexeme(self):
         data = {'text': 'синий слон'}
-        response = self.executeOK(data)
+        response = self.executeOK(data=data)
         self.assertEqual(len(response.data['items']), 12)
         self.assertEqual(response.data['items'][0]['text'], 'синий слон')

rsconcept/backend/apps/rsform/tests/s_views/t_constituents.py

@@ -1,7 +1,6 @@
 ''' Testing API: Constituents. '''
 from apps.rsform.models import Constituenta, CstType, RSForm
-
+from shared.EndpointTester import EndpointTester, decl_endpoint
-from ..EndpointTester import EndpointTester, decl_endpoint
 
 
 class TestConstituentaAPI(EndpointTester):
@@ -52,18 +51,18 @@ class TestConstituentaAPI(EndpointTester):
     @decl_endpoint('/api/constituents/{item}', method='patch')
     def test_partial_update(self):
         data = {'convention': 'tt'}
-        self.executeForbidden(data, item=self.cst2.pk)
+        self.executeForbidden(data=data, item=self.cst2.pk)
 
         self.logout()
-        self.executeForbidden(data, item=self.cst1.pk)
+        self.executeForbidden(data=data, item=self.cst1.pk)
 
         self.login()
-        response = self.executeOK(data, item=self.cst1.pk)
+        response = self.executeOK(data=data, item=self.cst1.pk)
         self.cst1.refresh_from_db()
         self.assertEqual(response.data['convention'], 'tt')
         self.assertEqual(self.cst1.convention, 'tt')
 
-        self.executeOK(data, item=self.cst1.pk)
+        self.executeOK(data=data, item=self.cst1.pk)
 
 
     @decl_endpoint('/api/constituents/{item}', method='patch')
@@ -72,7 +71,7 @@ class TestConstituentaAPI(EndpointTester):
             'term_raw': 'New term',
             'definition_raw': 'New def'
         }
-        response = self.executeOK(data, item=self.cst3.pk)
+        response = self.executeOK(data=data, item=self.cst3.pk)
         self.cst3.refresh_from_db()
         self.assertEqual(response.data['term_resolved'], 'New term')
         self.assertEqual(self.cst3.term_resolved, 'New term')
@@ -86,7 +85,7 @@ class TestConstituentaAPI(EndpointTester):
             'term_raw': '@{X1|nomn,sing}',
             'definition_raw': '@{X1|nomn,sing} @{X1|sing,datv}'
         }
-        response = self.executeOK(data, item=self.cst3.pk)
+        response = self.executeOK(data=data, item=self.cst3.pk)
         self.cst3.refresh_from_db()
         self.assertEqual(self.cst3.term_resolved, self.cst1.term_resolved)
         self.assertEqual(response.data['term_resolved'], self.cst1.term_resolved)
@@ -97,7 +96,7 @@ class TestConstituentaAPI(EndpointTester):
     @decl_endpoint('/api/constituents/{item}', method='patch')
     def test_readonly_cst_fields(self):
         data = {'alias': 'X33', 'order': 10}
-        response = self.executeOK(data, item=self.cst1.pk)
+        response = self.executeOK(data=data, item=self.cst1.pk)
         self.assertEqual(response.data['alias'], 'X1')
         self.assertEqual(response.data['alias'], self.cst1.alias)
         self.assertEqual(response.data['order'], self.cst1.order)

rsconcept/backend/apps/rsform/tests/s_views/t_library.py

@@ -11,9 +11,8 @@ from apps.rsform.models import (
     RSForm,
     Subscription
 )
-
+from shared.EndpointTester import EndpointTester, decl_endpoint
-from ..EndpointTester import EndpointTester, decl_endpoint
+from shared.testing_utils import response_contains
-from ..testing_utils import response_contains
 
 
 class TestLibraryViewset(EndpointTester):
@@ -49,17 +48,17 @@ class TestLibraryViewset(EndpointTester):
             'title': 'Title',
             'alias': 'alias',
         }
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         data = {
-            'item_type': LibraryItemType.OPERATIONS_SCHEMA,
+            'item_type': LibraryItemType.OPERATION_SCHEMA,
             'title': 'Title',
             'alias': 'alias',
             'access_policy': AccessPolicy.PROTECTED,
             'visible': False,
             'read_only': True
         }
-        response = self.executeCreated(data)
+        response = self.executeCreated(data=data)
         self.assertEqual(response.data['owner'], self.user.pk)
         self.assertEqual(response.data['item_type'], data['item_type'])
         self.assertEqual(response.data['title'], data['title'])
@@ -70,25 +69,25 @@ class TestLibraryViewset(EndpointTester):
 
         self.logout()
         data = {'title': 'Title2'}
-        self.executeForbidden(data)
+        self.executeForbidden(data=data)
 
 
     @decl_endpoint('/api/library/{item}', method='patch')
     def test_update(self):
         data = {'id': self.unowned.pk, 'title': 'New Title'}
-        self.executeNotFound(data, item=self.invalid_item)
+        self.executeNotFound(data=data, item=self.invalid_item)
-        self.executeForbidden(data, item=self.unowned.pk)
+        self.executeForbidden(data=data, item=self.unowned.pk)
 
         self.toggle_editor(self.unowned, True)
-        response = self.executeOK(data, item=self.unowned.pk)
+        response = self.executeOK(data=data, item=self.unowned.pk)
         self.assertEqual(response.data['title'], data['title'])
 
         self.unowned.access_policy = AccessPolicy.PRIVATE
         self.unowned.save()
-        self.executeForbidden(data, item=self.unowned.pk)
+        self.executeForbidden(data=data, item=self.unowned.pk)
 
         data = {'id': self.owned.pk, 'title': 'New Title'}
-        response = self.executeOK(data, item=self.owned.pk)
+        response = self.executeOK(data=data, item=self.owned.pk)
         self.assertEqual(response.data['title'], data['title'])
         self.assertEqual(response.data['alias'], self.owned.alias)
 
@@ -99,7 +98,7 @@ class TestLibraryViewset(EndpointTester):
             'access_policy': AccessPolicy.PROTECTED,
             'location': LocationHead.LIBRARY
         }
-        response = self.executeOK(data, item=self.owned.pk)
+        response = self.executeOK(data=data, item=self.owned.pk)
         self.assertEqual(response.data['title'], data['title'])
         self.assertEqual(response.data['owner'], self.owned.owner.pk)
         self.assertEqual(response.data['access_policy'], self.owned.access_policy)
@@ -112,22 +111,22 @@ class TestLibraryViewset(EndpointTester):
         time_update = self.owned.time_update
 
         data = {'user': self.user.pk}
-        self.executeNotFound(data, item=self.invalid_item)
+        self.executeNotFound(data=data, item=self.invalid_item)
-        self.executeForbidden(data, item=self.unowned.pk)
+        self.executeForbidden(data=data, item=self.unowned.pk)
-        self.executeOK(data, item=self.owned.pk)
+        self.executeOK(data=data, item=self.owned.pk)
         self.owned.refresh_from_db()
         self.assertEqual(self.owned.owner, self.user)
 
         data = {'user': self.user2.pk}
-        self.executeOK(data, item=self.owned.pk)
+        self.executeOK(data=data, item=self.owned.pk)
         self.owned.refresh_from_db()
         self.assertEqual(self.owned.owner, self.user2)
         self.assertEqual(self.owned.time_update, time_update)
-        self.executeForbidden(data, item=self.owned.pk)
+        self.executeForbidden(data=data, item=self.owned.pk)
 
         self.toggle_admin(True)
         data = {'user': self.user.pk}
-        self.executeOK(data, item=self.owned.pk)
+        self.executeOK(data=data, item=self.owned.pk)
         self.owned.refresh_from_db()
         self.assertEqual(self.owned.owner, self.user)
 
@@ -136,20 +135,20 @@ class TestLibraryViewset(EndpointTester):
         time_update = self.owned.time_update
 
         data = {'access_policy': 'invalid'}
-        self.executeBadData(data, item=self.owned.pk)
+        self.executeBadData(data=data, item=self.owned.pk)
 
         data = {'access_policy': AccessPolicy.PRIVATE}
-        self.executeNotFound(data, item=self.invalid_item)
+        self.executeNotFound(data=data, item=self.invalid_item)
-        self.executeForbidden(data, item=self.unowned.pk)
+        self.executeForbidden(data=data, item=self.unowned.pk)
-        self.executeOK(data, item=self.owned.pk)
+        self.executeOK(data=data, item=self.owned.pk)
         self.owned.refresh_from_db()
         self.assertEqual(self.owned.access_policy, data['access_policy'])
 
         self.toggle_editor(self.unowned, True)
-        self.executeForbidden(data, item=self.unowned.pk)
+        self.executeForbidden(data=data, item=self.unowned.pk)
 
         self.toggle_admin(True)
-        self.executeOK(data, item=self.unowned.pk)
+        self.executeOK(data=data, item=self.unowned.pk)
         self.unowned.refresh_from_db()
         self.assertEqual(self.unowned.access_policy, data['access_policy'])
 
@@ -158,29 +157,29 @@ class TestLibraryViewset(EndpointTester):
         time_update = self.owned.time_update
 
         data = {'location': 'invalid'}
-        self.executeBadData(data, item=self.owned.pk)
+        self.executeBadData(data=data, item=self.owned.pk)
 
         data = {'location': '/U/temp'}
-        self.executeNotFound(data, item=self.invalid_item)
+        self.executeNotFound(data=data, item=self.invalid_item)
-        self.executeForbidden(data, item=self.unowned.pk)
+        self.executeForbidden(data=data, item=self.unowned.pk)
-        self.executeOK(data, item=self.owned.pk)
+        self.executeOK(data=data, item=self.owned.pk)
         self.owned.refresh_from_db()
         self.assertEqual(self.owned.location, data['location'])
 
         data = {'location': LocationHead.LIBRARY}
-        self.executeForbidden(data, item=self.owned.pk)
+        self.executeForbidden(data=data, item=self.owned.pk)
 
         data = {'location': '/U/temp'}
         self.toggle_editor(self.unowned, True)
-        self.executeForbidden(data, item=self.unowned.pk)
+        self.executeForbidden(data=data, item=self.unowned.pk)
 
         self.toggle_admin(True)
         data = {'location': LocationHead.LIBRARY}
-        self.executeOK(data, item=self.owned.pk)
+        self.executeOK(data=data, item=self.owned.pk)
         self.owned.refresh_from_db()
         self.assertEqual(self.owned.location, data['location'])
 
-        self.executeOK(data, item=self.unowned.pk)
+        self.executeOK(data=data, item=self.unowned.pk)
         self.unowned.refresh_from_db()
         self.assertEqual(self.unowned.location, data['location'])
 
@@ -189,22 +188,22 @@ class TestLibraryViewset(EndpointTester):
         time_update = self.owned.time_update
 
         data = {'user': self.invalid_user}
-        self.executeBadData(data, item=self.owned.pk)
+        self.executeBadData(data=data, item=self.owned.pk)
 
         data = {'user': self.user.pk}
-        self.executeNotFound(data, item=self.invalid_item)
+        self.executeNotFound(data=data, item=self.invalid_item)
-        self.executeForbidden(data, item=self.unowned.pk)
+        self.executeForbidden(data=data, item=self.unowned.pk)
 
-        self.executeOK(data, item=self.owned.pk)
+        self.executeOK(data=data, item=self.owned.pk)
         self.owned.refresh_from_db()
         self.assertEqual(self.owned.time_update, time_update)
         self.assertEqual(self.owned.editors(), [self.user])
 
-        self.executeOK(data)
+        self.executeOK(data=data)
         self.assertEqual(self.owned.editors(), [self.user])
 
         data = {'user': self.user2.pk}
-        self.executeOK(data)
+        self.executeOK(data=data)
         self.assertEqual(set(self.owned.editors()), set([self.user, self.user2]))
 
 
@@ -213,25 +212,25 @@ class TestLibraryViewset(EndpointTester):
         time_update = self.owned.time_update
 
         data = {'user': self.invalid_user}
-        self.executeBadData(data, item=self.owned.pk)
+        self.executeBadData(data=data, item=self.owned.pk)
 
         data = {'user': self.user.pk}
-        self.executeNotFound(data, item=self.invalid_item)
+        self.executeNotFound(data=data, item=self.invalid_item)
-        self.executeForbidden(data, item=self.unowned.pk)
+        self.executeForbidden(data=data, item=self.unowned.pk)
 
-        self.executeOK(data, item=self.owned.pk)
+        self.executeOK(data=data, item=self.owned.pk)
         self.owned.refresh_from_db()
         self.assertEqual(self.owned.time_update, time_update)
         self.assertEqual(self.owned.editors(), [])
 
         Editor.add(item=self.owned, user=self.user)
-        self.executeOK(data)
+        self.executeOK(data=data)
         self.assertEqual(self.owned.editors(), [])
 
         Editor.add(item=self.owned, user=self.user)
         Editor.add(item=self.owned, user=self.user2)
         data = {'user': self.user2.pk}
-        self.executeOK(data)
+        self.executeOK(data=data)
         self.assertEqual(self.owned.editors(), [self.user])
 
 
@@ -240,30 +239,30 @@ class TestLibraryViewset(EndpointTester):
         time_update = self.owned.time_update
 
         data = {'users': [self.invalid_user]}
-        self.executeBadData(data, item=self.owned.pk)
+        self.executeBadData(data=data, item=self.owned.pk)
 
         data = {'users': [self.user.pk]}
-        self.executeNotFound(data, item=self.invalid_item)
+        self.executeNotFound(data=data, item=self.invalid_item)
-        self.executeForbidden(data, item=self.unowned.pk)
+        self.executeForbidden(data=data, item=self.unowned.pk)
 
-        self.executeOK(data, item=self.owned.pk)
+        self.executeOK(data=data, item=self.owned.pk)
         self.owned.refresh_from_db()
         self.assertEqual(self.owned.time_update, time_update)
         self.assertEqual(self.owned.editors(), [self.user])
 
-        self.executeOK(data)
+        self.executeOK(data=data)
         self.assertEqual(self.owned.editors(), [self.user])
 
         data = {'users': [self.user2.pk]}
-        self.executeOK(data)
+        self.executeOK(data=data)
         self.assertEqual(self.owned.editors(), [self.user2])
 
         data = {'users': []}
-        self.executeOK(data)
+        self.executeOK(data=data)
         self.assertEqual(self.owned.editors(), [])
 
         data = {'users': [self.user2.pk, self.user.pk]}
-        self.executeOK(data)
+        self.executeOK(data=data)
         self.assertEqual(set(self.owned.editors()), set([self.user2, self.user]))
 
 
@@ -294,7 +293,7 @@ class TestLibraryViewset(EndpointTester):
     @decl_endpoint('/api/library', method='get')
     def test_library_get(self):
         non_schema = LibraryItem.objects.create(
-            item_type=LibraryItemType.OPERATIONS_SCHEMA,
+            item_type=LibraryItemType.OPERATION_SCHEMA,
             title='Test4'
         )
         response = self.executeOK()
@@ -376,11 +375,11 @@ class TestLibraryViewset(EndpointTester):
         )
 
         data = {'title': 'Title1337'}
-        self.executeNotFound(data, item=self.invalid_item)
+        self.executeNotFound(data=data, item=self.invalid_item)
-        self.executeCreated(data, item=self.unowned.pk)
+        self.executeCreated(data=data, item=self.unowned.pk)
 
         data = {'title': 'Title1338'}
-        response = self.executeCreated(data, item=self.owned.pk)
+        response = self.executeCreated(data=data, item=self.owned.pk)
         self.assertEqual(response.data['title'], data['title'])
         self.assertEqual(len(response.data['items']), 2)
         self.assertEqual(response.data['items'][0]['alias'], x12.alias)
@@ -390,12 +389,12 @@ class TestLibraryViewset(EndpointTester):
         self.assertEqual(response.data['items'][1]['term_resolved'], d2.term_resolved)
 
         data = {'title': 'Title1340', 'items': []}
-        response = self.executeCreated(data, item=self.owned.pk)
+        response = self.executeCreated(data=data, item=self.owned.pk)
         self.assertEqual(response.data['title'], data['title'])
         self.assertEqual(len(response.data['items']), 0)
 
         data = {'title': 'Title1341', 'items': [x12.pk]}
-        response = self.executeCreated(data, item=self.owned.pk)
+        response = self.executeCreated(data=data, item=self.owned.pk)
         self.assertEqual(response.data['title'], data['title'])
         self.assertEqual(len(response.data['items']), 1)
         self.assertEqual(response.data['items'][0]['alias'], x12.alias)

rsconcept/backend/apps/rsform/tests/s_views/t_operations.py

@@ -1,7 +1,6 @@
 ''' Testing API: Operations. '''
 from apps.rsform.models import Constituenta, CstType, RSForm
-
+from shared.EndpointTester import EndpointTester, decl_endpoint
-from ..EndpointTester import EndpointTester, decl_endpoint
 
 
 class TestInlineSynthesis(EndpointTester):
@@ -24,20 +23,20 @@ class TestInlineSynthesis(EndpointTester):
             'items': [],
             'substitutions': []
         }
-        self.executeForbidden(data)
+        self.executeForbidden(data=data)
 
         data['receiver'] = invalid_id
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         data['receiver'] = self.schema1.item.pk
         data['source'] = invalid_id
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         data['source'] = self.schema1.item.pk
-        self.executeOK(data)
+        self.executeOK(data=data)
 
         data['items'] = [invalid_id]
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
 
     def test_inline_synthesis(self):
@@ -68,7 +67,7 @@ class TestInlineSynthesis(EndpointTester):
                 }
             ]
         }
-        response = self.executeOK(data)
+        response = self.executeOK(data=data)
         result = {item['alias']: item for item in response.data['items']}
         self.assertEqual(len(result), 6)
         self.assertEqual(result['X2']['term_raw'], ks1_x2.term_raw)

rsconcept/backend/apps/rsform/tests/s_views/t_rsforms.py

@@ -15,9 +15,8 @@ from apps.rsform.models import (
     LocationHead,
     RSForm
 )
-
+from shared.EndpointTester import EndpointTester, decl_endpoint
-from ..EndpointTester import EndpointTester, decl_endpoint
+from shared.testing_utils import response_contains
-from ..testing_utils import response_contains
 
 
 class TestRSFormViewset(EndpointTester):
@@ -44,7 +43,7 @@ class TestRSFormViewset(EndpointTester):
             'access_policy': AccessPolicy.PROTECTED,
             'visible': False
         }
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         with open(f'{work_dir}/data/sample-rsform.trs', 'rb') as file:
             data['file'] = file
@@ -59,7 +58,7 @@ class TestRSFormViewset(EndpointTester):
     @decl_endpoint('/api/rsforms', method='get')
     def test_list_rsforms(self):
         non_schema = LibraryItem.objects.create(
-            item_type=LibraryItemType.OPERATIONS_SCHEMA,
+            item_type=LibraryItemType.OPERATION_SCHEMA,
             title='Test3'
         )
         response = self.executeOK()
@@ -124,14 +123,14 @@ class TestRSFormViewset(EndpointTester):
     def test_check(self):
         self.owned.insert_new('X1')
         data = {'expression': 'X1=X1'}
-        response = self.executeOK(data, item=self.owned_id)
+        response = self.executeOK(data=data, item=self.owned_id)
         self.assertEqual(response.data['parseResult'], True)
         self.assertEqual(response.data['syntax'], 'math')
         self.assertEqual(response.data['astText'], '[=[X1][X1]]')
         self.assertEqual(response.data['typification'], 'LOGIC')
         self.assertEqual(response.data['valueClass'], 'value')
 
-        self.executeOK(data, item=self.unowned_id)
+        self.executeOK(data=data, item=self.unowned_id)
 
 
     @decl_endpoint('/api/rsforms/{item}/resolve', method='post')
@@ -142,7 +141,7 @@ class TestRSFormViewset(EndpointTester):
         )
 
         data = {'text': '@{1|редкий} @{X1|plur,datv}'}
-        response = self.executeOK(data, item=self.owned_id)
+        response = self.executeOK(data=data, item=self.owned_id)
         self.assertEqual(response.data['input'], '@{1|редкий} @{X1|plur,datv}')
         self.assertEqual(response.data['output'], 'редким синим слонам')
         self.assertEqual(len(response.data['refs']), 2)
@@ -189,13 +188,19 @@ class TestRSFormViewset(EndpointTester):
 
     @decl_endpoint('/api/rsforms/{item}/cst-create', method='post')
     def test_create_constituenta(self):
-        data = {'alias': 'X3', 'cst_type': CstType.BASE}
+        data = {'alias': 'X3'}
-        self.executeForbidden(data, item=self.unowned_id)
+        self.executeForbidden(data=data, item=self.unowned_id)
 
         self.owned.insert_new('X1')
         x2 = self.owned.insert_new('X2')
+        self.executeBadData(item=self.owned_id)
+        self.executeBadData(data=data, item=self.owned_id)
 
-        response = self.executeCreated(data, item=self.owned_id)
+        data['cst_type'] = 'invalid'
+        self.executeBadData(data=data, item=self.owned_id)
+
+        data['cst_type'] = CstType.BASE
+        response = self.executeCreated(data=data, item=self.owned_id)
         self.assertEqual(response.data['new_cst']['alias'], 'X3')
         x3 = Constituenta.objects.get(alias=response.data['new_cst']['alias'])
         self.assertEqual(x3.order, 3)
@@ -207,7 +212,7 @@ class TestRSFormViewset(EndpointTester):
             'term_raw': 'test',
             'term_forms': [{'text': 'form1', 'tags': 'sing,datv'}]
         }
-        response = self.executeCreated(data, item=self.owned_id)
+        response = self.executeCreated(data=data, item=self.owned_id)
         self.assertEqual(response.data['new_cst']['alias'], data['alias'])
         x4 = Constituenta.objects.get(alias=response.data['new_cst']['alias'])
         self.assertEqual(x4.order, 3)
@@ -234,14 +239,14 @@ class TestRSFormViewset(EndpointTester):
         )
 
         data = {'target': x2_2.pk, 'alias': 'D2', 'cst_type': CstType.TERM}
-        self.executeForbidden(data, item=self.unowned_id)
+        self.executeForbidden(data=data, item=self.unowned_id)
-        self.executeBadData(data, item=self.owned_id)
+        self.executeBadData(data=data, item=self.owned_id)
 
         data = {'target': x1.pk, 'alias': x1.alias, 'cst_type': CstType.TERM}
-        self.executeBadData(data, item=self.owned_id)
+        self.executeBadData(data=data, item=self.owned_id)
 
         data = {'target': x1.pk, 'alias': x3.alias}
-        self.executeBadData(data, item=self.owned_id)
+        self.executeBadData(data=data, item=self.owned_id)
 
         d1 = self.owned.insert_new(
             alias='D1',
@@ -253,7 +258,7 @@ class TestRSFormViewset(EndpointTester):
         self.assertEqual(x1.cst_type, CstType.BASE)
 
         data = {'target': x1.pk, 'alias': 'D2', 'cst_type': CstType.TERM}
-        response = self.executeOK(data, item=self.owned_id)
+        response = self.executeOK(data=data, item=self.owned_id)
         self.assertEqual(response.data['new_cst']['alias'], 'D2')
         self.assertEqual(response.data['new_cst']['cst_type'], CstType.TERM)
         d1.refresh_from_db()
@@ -280,14 +285,14 @@ class TestRSFormViewset(EndpointTester):
         unowned = self.unowned.insert_new('X2')
 
         data = {'substitutions': [{'original': x1.pk, 'substitution': unowned.pk, 'transfer_term': True}]}
-        self.executeForbidden(data, item=self.unowned_id)
+        self.executeForbidden(data=data, item=self.unowned_id)
-        self.executeBadData(data, item=self.owned_id)
+        self.executeBadData(data=data, item=self.owned_id)
 
         data = {'substitutions': [{'original': unowned.pk, 'substitution': x1.pk, 'transfer_term': True}]}
-        self.executeBadData(data, item=self.owned_id)
+        self.executeBadData(data=data, item=self.owned_id)
 
         data = {'substitutions': [{'original': x1.pk, 'substitution': x1.pk, 'transfer_term': True}]}
-        self.executeBadData(data, item=self.owned_id)
+        self.executeBadData(data=data, item=self.owned_id)
 
         d1 = self.owned.insert_new(
             alias='D1',
@@ -295,7 +300,7 @@ class TestRSFormViewset(EndpointTester):
             definition_formal='X1'
         )
         data = {'substitutions': [{'original': x1.pk, 'substitution': x2.pk, 'transfer_term': True}]}
-        response = self.executeOK(data, item=self.owned_id)
+        response = self.executeOK(data=data, item=self.owned_id)
         d1.refresh_from_db()
         x2.refresh_from_db()
         self.assertEqual(x2.term_raw, 'Test1')
@@ -315,7 +320,7 @@ class TestRSFormViewset(EndpointTester):
         )
 
         data = {'substitutions': []}
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         data = {'substitutions': [
             {
@@ -329,7 +334,7 @@ class TestRSFormViewset(EndpointTester):
                 'transfer_term': True
             }
         ]}
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         data = {'substitutions': [
             {
@@ -343,7 +348,7 @@ class TestRSFormViewset(EndpointTester):
                 'transfer_term': True
             }
         ]}
-        response = self.executeOK(data, item=self.owned_id)
+        response = self.executeOK(data=data, item=self.owned_id)
         d3.refresh_from_db()
         self.assertEqual(d3.definition_formal, r'D1 \ D2')
 
@@ -358,7 +363,7 @@ class TestRSFormViewset(EndpointTester):
             'definition_formal': '3',
             'definition_raw': '4'
         }
-        response = self.executeCreated(data, item=self.owned_id)
+        response = self.executeCreated(data=data, item=self.owned_id)
         self.assertEqual(response.data['new_cst']['alias'], 'X3')
         self.assertEqual(response.data['new_cst']['cst_type'], CstType.BASE)
         self.assertEqual(response.data['new_cst']['convention'], '1')
@@ -374,13 +379,13 @@ class TestRSFormViewset(EndpointTester):
         self.set_params(item=self.owned_id)
 
         data = {'items': [1337]}
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         x1 = self.owned.insert_new('X1')
         x2 = self.owned.insert_new('X2')
 
         data = {'items': [x1.pk]}
-        response = self.executeOK(data)
+        response = self.executeOK(data=data)
         x2.refresh_from_db()
         self.owned.item.refresh_from_db()
         self.assertEqual(len(response.data['items']), 1)
@@ -390,7 +395,7 @@ class TestRSFormViewset(EndpointTester):
 
         x3 = self.unowned.insert_new('X1')
         data = {'items': [x3.pk]}
-        self.executeBadData(data, item=self.owned_id)
+        self.executeBadData(data=data, item=self.owned_id)
 
 
     @decl_endpoint('/api/rsforms/{item}/cst-moveto', method='patch')
@@ -398,13 +403,13 @@ class TestRSFormViewset(EndpointTester):
         self.set_params(item=self.owned_id)
 
         data = {'items': [1337], 'move_to': 1}
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         x1 = self.owned.insert_new('X1')
         x2 = self.owned.insert_new('X2')
 
         data = {'items': [x2.pk], 'move_to': 1}
-        response = self.executeOK(data)
+        response = self.executeOK(data=data)
         x1.refresh_from_db()
         x2.refresh_from_db()
         self.assertEqual(response.data['id'], self.owned_id)
@@ -413,7 +418,7 @@ class TestRSFormViewset(EndpointTester):
 
         x3 = self.unowned.insert_new('X1')
         data = {'items': [x3.pk], 'move_to': 1}
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
 
     @decl_endpoint('/api/rsforms/{item}/reset-aliases', method='patch')

rsconcept/backend/apps/rsform/tests/s_views/t_rslang.py

@@ -1,5 +1,5 @@
 ''' Testing views '''
-from ..EndpointTester import EndpointTester, decl_endpoint
+from shared.EndpointTester import EndpointTester, decl_endpoint
 
 
 class TestRSLanguageViews(EndpointTester):
@@ -8,30 +8,30 @@ class TestRSLanguageViews(EndpointTester):
     @decl_endpoint('/api/rslang/to-ascii', method='post')
     def test_convert_to_ascii(self):
         data = {'data': '1=1'}
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         data = {'expression': '1=1'}
-        response = self.executeOK(data)
+        response = self.executeOK(data=data)
         self.assertEqual(response.data['result'], r'1 \eq 1')
 
 
     @decl_endpoint('/api/rslang/to-math', method='post')
     def test_convert_to_math(self):
         data = {'data': r'1 \eq 1'}
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         data = {'expression': r'1 \eq 1'}
-        response = self.executeOK(data)
+        response = self.executeOK(data=data)
         self.assertEqual(response.data['result'], r'1=1')
 
 
     @decl_endpoint('/api/rslang/parse-expression', method='post')
     def test_parse_expression(self):
         data = {'data': r'1=1'}
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         data = {'expression': r'1=1'}
-        response = self.executeOK(data)
+        response = self.executeOK(data=data)
         self.assertEqual(response.data['parseResult'], True)
         self.assertEqual(response.data['syntax'], 'math')
         self.assertEqual(response.data['astText'], '[=[1][1]]')

rsconcept/backend/apps/rsform/tests/s_views/t_versions.py

@@ -7,8 +7,7 @@ from zipfile import ZipFile
 from rest_framework import status
 
 from apps.rsform.models import Constituenta, RSForm
-
+from shared.EndpointTester import EndpointTester, decl_endpoint
-from ..EndpointTester import EndpointTester, decl_endpoint
 
 
 class TestVersionViews(EndpointTester):
@@ -31,11 +30,11 @@ class TestVersionViews(EndpointTester):
         invalid_id = 1338
         data = {'version': '1.0.0', 'description': 'test'}
 
-        self.executeNotFound(data, schema=invalid_id)
+        self.executeNotFound(data=data, schema=invalid_id)
-        self.executeForbidden(data, schema=self.unowned.pk)
+        self.executeForbidden(data=data, schema=self.unowned.pk)
-        self.executeBadData(invalid_data, schema=self.owned.pk)
+        self.executeBadData(data=invalid_data, schema=self.owned.pk)
 
-        response = self.executeCreated(data, schema=self.owned.pk)
+        response = self.executeCreated(data=data, schema=self.owned.pk)
         self.assertTrue('version' in response.data)
         self.assertTrue('schema' in response.data)
         self.assertTrue(response.data['version'] in [v['id'] for v in response.data['schema']['versions']])
@@ -65,7 +64,7 @@ class TestVersionViews(EndpointTester):
     @decl_endpoint('/api/versions/{version}', method='get')
     def test_access_version(self):
         data = {'version': '1.0.0', 'description': 'test'}
-        version_id = self._create_version(data)
+        version_id = self._create_version(data=data)
         invalid_id = version_id + 1337
 
         self.executeNotFound(version=invalid_id)
@@ -79,14 +78,14 @@ class TestVersionViews(EndpointTester):
 
         data = {'version': '1.2.0', 'description': 'test1'}
         self.method = 'patch'
-        self.executeForbidden(data)
+        self.executeForbidden(data=data)
 
         self.method = 'delete'
         self.executeForbidden()
 
         self.client.force_authenticate(user=self.user)
         self.method = 'patch'
-        self.executeOK(data)
+        self.executeOK(data=data)
         response = self.get()
         self.assertEqual(response.data['version'], data['version'])
         self.assertEqual(response.data['description'], data['description'])
@@ -139,7 +138,7 @@ class TestVersionViews(EndpointTester):
         x2 = self.schema.insert_new('X2')
         d1 = self.schema.insert_new('D1', term_raw='TestTerm')
         data = {'version': '1.0.0', 'description': 'test'}
-        version_id = self._create_version(data)
+        version_id = self._create_version(data=data)
         invalid_id = version_id + 1337
 
         d1.delete()

rsconcept/backend/apps/rsform/views/constituents.py

@@ -2,8 +2,9 @@
 from drf_spectacular.utils import extend_schema, extend_schema_view
 from rest_framework import generics
 
+from shared import permissions
+
 from .. import models as m
-from .. import permissions
 from .. import serializers as s
 
 

rsconcept/backend/apps/rsform/views/library.py

@@ -13,8 +13,9 @@ from rest_framework.decorators import action
 from rest_framework.request import Request
 from rest_framework.response import Response
 
+from shared import permissions
+
 from .. import models as m
-from .. import permissions
 from .. import serializers as s
 
 
@@ -42,17 +43,27 @@ class LibraryViewSet(viewsets.ModelViewSet):
 
     def get_permissions(self):
         if self.action in ['update', 'partial_update']:
-            permission_list = [permissions.ItemEditor]
+            access_level = permissions.ItemEditor
         elif self.action in [
-            'destroy', 'set_owner', 'set_access_policy', 'set_location',
+            'destroy',
-            'editors_add', 'editors_remove', 'editors_set'
+            'set_owner',
+            'set_access_policy',
+            'set_location',
+            'editors_add',
+            'editors_remove',
+            'editors_set'
         ]:
-            permission_list = [permissions.ItemOwner]
+            access_level = permissions.ItemOwner
-        elif self.action in ['create', 'clone', 'subscribe', 'unsubscribe']:
+        elif self.action in [
-            permission_list = [permissions.GlobalUser]
+            'create',
+            'clone',
+            'subscribe',
+            'unsubscribe'
+        ]:
+            access_level = permissions.GlobalUser
         else:
-            permission_list = [permissions.ItemAnyone]
+            access_level = permissions.ItemAnyone
-        return [permission() for permission in permission_list]
+        return [access_level()]
 
     def _get_item(self) -> m.LibraryItem:
         return cast(m.LibraryItem, self.get_object())
@@ -68,7 +79,6 @@ class LibraryViewSet(viewsets.ModelViewSet):
             c.HTTP_404_NOT_FOUND: None
         }
     )
-    @transaction.atomic
     @action(detail=True, methods=['post'], url_path='clone')
     def clone(self, request: Request, pk):
         ''' Endpoint: Create deep copy of library item. '''
@@ -85,19 +95,20 @@ class LibraryViewSet(viewsets.ModelViewSet):
         clone.read_only = False
         clone.access_policy = serializer.validated_data.get('access_policy', m.AccessPolicy.PUBLIC)
         clone.location = serializer.validated_data.get('location', m.LocationHead.USER)
-        clone.save()
 
-        if clone.item_type == m.LibraryItemType.RSFORM:
+        with transaction.atomic():
-            need_filter = 'items' in request.data
+            clone.save()
-            for cst in m.RSForm(item).constituents():
+            if clone.item_type == m.LibraryItemType.RSFORM:
-                if not need_filter or cst.pk in request.data['items']:
+                need_filter = 'items' in request.data
-                    cst.pk = None
+                for cst in m.RSForm(item).constituents():
-                    cst.schema = clone
+                    if not need_filter or cst.pk in request.data['items']:
-                    cst.save()
+                        cst.pk = None
-            return Response(
+                        cst.schema = clone
-                status=c.HTTP_201_CREATED,
+                        cst.save()
-                data=s.RSFormParseSerializer(clone).data
+                return Response(
-            )
+                    status=c.HTTP_201_CREATED,
+                    data=s.RSFormParseSerializer(clone).data
+                )
         return Response(status=c.HTTP_400_BAD_REQUEST)
 
     @extend_schema(
@@ -266,24 +277,17 @@ class LibraryActiveView(generics.ListAPIView):
     serializer_class = s.LibraryItemSerializer
 
     def get_queryset(self):
+        common_location = Q(location__startswith=m.LocationHead.COMMON) | Q(location__startswith=m.LocationHead.LIBRARY)
+        is_public = Q(access_policy=m.AccessPolicy.PUBLIC)
         if self.request.user.is_anonymous:
-            return m.LibraryItem.objects.filter(
+            return m.LibraryItem.objects \
-                Q(access_policy=m.AccessPolicy.PUBLIC),
+                .filter(is_public) \
-            ).filter(
+                .filter(common_location).order_by('-time_update')
-                Q(location__startswith=m.LocationHead.COMMON) |
-                Q(location__startswith=m.LocationHead.LIBRARY)
-            ).order_by('-time_update')
         else:
             user = cast(m.User, self.request.user)
             # pylint: disable=unsupported-binary-operation
             return m.LibraryItem.objects.filter(
-                (
+                (is_public & common_location) |
-                    Q(access_policy=m.AccessPolicy.PUBLIC) &
-                    (
-                        Q(location__startswith=m.LocationHead.COMMON) |
-                        Q(location__startswith=m.LocationHead.LIBRARY)
-                    )
-                ) |
                 Q(owner=user) |
                 Q(editor__editor=user) |
                 Q(subscription__user=user)

rsconcept/backend/apps/rsform/views/operations.py

@@ -18,7 +18,6 @@ from .. import serializers as s
     request=s.InlineSynthesisSerializer,
     responses={c.HTTP_200_OK: s.RSFormParseSerializer}
 )
-@transaction.atomic
 @api_view(['PATCH'])
 def inline_synthesis(request: Request):
     ''' Endpoint: Inline synthesis. '''
@@ -30,20 +29,21 @@ def inline_synthesis(request: Request):
 
     schema = m.RSForm(serializer.validated_data['receiver'])
     items = cast(list[m.Constituenta], serializer.validated_data['items'])
-    new_items = schema.insert_copy(items)
 
-    for substitution in serializer.validated_data['substitutions']:
+    with transaction.atomic():
-        original = cast(m.Constituenta, substitution['original'])
+        new_items = schema.insert_copy(items)
-        replacement = cast(m.Constituenta, substitution['substitution'])
+        for substitution in serializer.validated_data['substitutions']:
-        if original in items:
+            original = cast(m.Constituenta, substitution['original'])
-            index = next(i for (i, cst) in enumerate(items) if cst == original)
+            replacement = cast(m.Constituenta, substitution['substitution'])
-            original = new_items[index]
+            if original in items:
-        else:
+                index = next(i for (i, cst) in enumerate(items) if cst == original)
-            index = next(i for (i, cst) in enumerate(items) if cst == replacement)
+                original = new_items[index]
-            replacement = new_items[index]
+            else:
-        schema.substitute(original, replacement, substitution['transfer_term'])
+                index = next(i for (i, cst) in enumerate(items) if cst == replacement)
+                replacement = new_items[index]
+            schema.substitute(original, replacement, substitution['transfer_term'])
+        schema.restore_order()
 
-    schema.restore_order()
     return Response(
         status=c.HTTP_200_OK,
         data=s.RSFormParseSerializer(schema.item).data

rsconcept/backend/apps/rsform/views/rsforms.py

@@ -13,9 +13,10 @@ from rest_framework.decorators import action, api_view
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from .. import messages as msg
+from shared import messages as msg
+from shared import permissions
+
 from .. import models as m
-from .. import permissions
 from .. import serializers as s
 from .. import utils
 
@@ -33,11 +34,21 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
     def get_permissions(self):
         ''' Determine permission class. '''
         if self.action in [
-            'load_trs', 'cst_create', 'cst_delete_multiple',
+            'load_trs',
-            'reset_aliases', 'cst_rename', 'cst_substitute'
+            'reset_aliases',
+            'cst_create',
+            'cst_delete_multiple',
+            'cst_rename',
+            'cst_substitute'
         ]:
             permission_list = [permissions.ItemEditor]
-        elif self.action in ['contents', 'details', 'export_trs', 'resolve', 'check']:
+        elif self.action in [
+            'contents',
+            'details',
+            'export_trs',
+            'resolve',
+            'check'
+        ]:
             permission_list = [permissions.ItemAnyone]
         else:
             permission_list = [permissions.Anyone]
@@ -49,6 +60,7 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
         request=s.CstCreateSerializer,
         responses={
             c.HTTP_201_CREATED: s.NewCstResponse,
+            c.HTTP_400_BAD_REQUEST: None,
             c.HTTP_403_FORBIDDEN: None,
             c.HTTP_404_NOT_FOUND: None
         }
@@ -60,10 +72,15 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
         serializer = s.CstCreateSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         data = serializer.validated_data
-        new_cst = schema.create_cst(
+        if 'insert_after' in data:
-            data=data,
+            try:
-            insert_after=data['insert_after'] if 'insert_after' in data else None
+                insert_after = m.Constituenta.objects.get(pk=data['insert_after'])
-        )
+            except m.LibraryItem.DoesNotExist:
+                return Response(status=c.HTTP_404_NOT_FOUND)
+        else:
+            insert_after = None
+        new_cst = schema.create_cst(data, insert_after)
+
         schema.item.refresh_from_db()
         response = Response(
             status=c.HTTP_201_CREATED,
@@ -81,6 +98,7 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
         request=s.CstTargetSerializer,
         responses={
             c.HTTP_200_OK: s.NewMultiCstResponse,
+            c.HTTP_400_BAD_REQUEST: None,
             c.HTTP_403_FORBIDDEN: None,
             c.HTTP_404_NOT_FOUND: None
         }
@@ -117,11 +135,11 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
         request=s.CstRenameSerializer,
         responses={
             c.HTTP_200_OK: s.NewCstResponse,
+            c.HTTP_400_BAD_REQUEST: None,
             c.HTTP_403_FORBIDDEN: None,
             c.HTTP_404_NOT_FOUND: None
         }
     )
-    @transaction.atomic
     @action(detail=True, methods=['patch'], url_path='cst-rename')
     def cst_rename(self, request: Request, pk):
         ''' Rename constituenta possibly changing type. '''
@@ -134,12 +152,12 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
 
         cst.alias = serializer.validated_data['alias']
         cst.cst_type = serializer.validated_data['cst_type']
-        cst.save()
 
-        mapping = {old_alias: cst.alias}
+        with transaction.atomic():
-        schema.apply_mapping(mapping, change_aliases=False)
+            cst.save()
-        schema.item.refresh_from_db()
+            schema.apply_mapping(mapping={old_alias: cst.alias}, change_aliases=False)
-        cst.refresh_from_db()
+            schema.item.refresh_from_db()
+            cst.refresh_from_db()
 
         return Response(
             status=c.HTTP_200_OK,
@@ -155,11 +173,11 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
         request=s.CstSubstituteSerializer,
         responses={
             c.HTTP_200_OK: s.RSFormParseSerializer,
+            c.HTTP_400_BAD_REQUEST: None,
             c.HTTP_403_FORBIDDEN: None,
             c.HTTP_404_NOT_FOUND: None
         }
     )
-    @transaction.atomic
     @action(detail=True, methods=['patch'], url_path='cst-substitute')
     def cst_substitute(self, request: Request, pk):
         ''' Substitute occurrences of constituenta with another one. '''
@@ -169,11 +187,13 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
             context={'schema': schema.item}
         )
         serializer.is_valid(raise_exception=True)
-        for substitution in serializer.validated_data['substitutions']:
+
-            original = cast(m.Constituenta, substitution['original'])
+        with transaction.atomic():
-            replacement = cast(m.Constituenta, substitution['substitution'])
+            for substitution in serializer.validated_data['substitutions']:
-            schema.substitute(original, replacement, substitution['transfer_term'])
+                original = cast(m.Constituenta, substitution['original'])
-        schema.item.refresh_from_db()
+                replacement = cast(m.Constituenta, substitution['substitution'])
+                schema.substitute(original, replacement, substitution['transfer_term'])
+            schema.item.refresh_from_db()
         return Response(
             status=c.HTTP_200_OK,
             data=s.RSFormParseSerializer(schema.item).data
@@ -185,6 +205,7 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
         request=s.CstListSerializer,
         responses={
             c.HTTP_200_OK: s.RSFormParseSerializer,
+            c.HTTP_400_BAD_REQUEST: None,
             c.HTTP_403_FORBIDDEN: None,
             c.HTTP_404_NOT_FOUND: None
         }
@@ -211,6 +232,7 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
         request=s.CstMoveSerializer,
         responses={
             c.HTTP_200_OK: s.RSFormParseSerializer,
+            c.HTTP_400_BAD_REQUEST: None,
             c.HTTP_403_FORBIDDEN: None,
             c.HTTP_404_NOT_FOUND: None
         }
@@ -279,6 +301,7 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
         request=s.RSFormUploadSerializer,
         responses={
             c.HTTP_200_OK: s.RSFormParseSerializer,
+            c.HTTP_400_BAD_REQUEST: None,
             c.HTTP_403_FORBIDDEN: None,
             c.HTTP_404_NOT_FOUND: None
         }
@@ -313,7 +336,7 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
             c.HTTP_404_NOT_FOUND: None
         }
     )
-    @action(detail=True, methods=['get'])
+    @action(detail=True, methods=['get'], url_path='contents')
     def contents(self, request: Request, pk):
         ''' Endpoint: View schema db contents (including constituents). '''
         schema = s.RSFormSerializer(self.get_object())
@@ -331,7 +354,7 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
             c.HTTP_404_NOT_FOUND: None
         }
     )
-    @action(detail=True, methods=['get'])
+    @action(detail=True, methods=['get'], url_path='details')
     def details(self, request: Request, pk):
         ''' Endpoint: Detailed schema view including statuses and parse. '''
         serializer = s.RSFormParseSerializer(cast(m.LibraryItem, self.get_object()))
@@ -349,7 +372,7 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
             c.HTTP_404_NOT_FOUND: None
         },
     )
-    @action(detail=True, methods=['post'])
+    @action(detail=True, methods=['post'], url_path='check')
     def check(self, request: Request, pk):
         ''' Endpoint: Check RSLang expression against schema context. '''
         serializer = s.ExpressionSerializer(data=request.data)
@@ -371,7 +394,7 @@ class RSFormViewSet(viewsets.GenericViewSet, generics.ListAPIView, generics.Retr
             c.HTTP_404_NOT_FOUND: None
         }
     )
-    @action(detail=True, methods=['post'])
+    @action(detail=True, methods=['post'], url_path='resolve')
     def resolve(self, request: Request, pk):
         ''' Endpoint: Resolve references in text against schema terms context. '''
         serializer = s.TextSerializer(data=request.data)

rsconcept/backend/apps/rsform/views/versions.py

@@ -10,8 +10,9 @@ from rest_framework.decorators import action, api_view, permission_classes
 from rest_framework.request import Request
 from rest_framework.response import Response
 
+from shared import permissions
+
 from .. import models as m
-from .. import permissions
 from .. import serializers as s
 from .. import utils
 
@@ -54,6 +55,7 @@ class VersionViewset(
     request=s.VersionCreateSerializer,
     responses={
         c.HTTP_201_CREATED: s.NewVersionResponse,
+        c.HTTP_400_BAD_REQUEST: None,
         c.HTTP_403_FORBIDDEN: None,
         c.HTTP_404_NOT_FOUND: None
     }

rsconcept/backend/apps/users/messages.py

@@ -1,14 +0,0 @@
-''' Utility: Text messages. '''
-# pylint: skip-file
-
-
-def passwordAuthFailed():
-    return 'Неизвестное сочетание имени пользователя (email) и пароля'
-
-
-def passwordsNotMatch():
-    return 'Введенные пароли не совпадают'
-
-
-def emailAlreadyTaken():
-    return 'Пользователь с данным email уже существует'

rsconcept/backend/apps/users/serializers.py

@@ -4,8 +4,8 @@ from django.contrib.auth.password_validation import validate_password
 from rest_framework import serializers
 
 from apps.rsform.models import Editor, Subscription
+from shared import messages as msg
 
-from . import messages as msg
 from . import models
 
 

rsconcept/backend/apps/users/tests/t_views.py

@@ -1,30 +1,30 @@
 ''' Testing API: users. '''
 from rest_framework.test import APIClient, APITestCase
 
-from apps.rsform.tests.EndpointTester import EndpointTester, decl_endpoint
 from apps.users.models import User
+from shared.EndpointTester import EndpointTester, decl_endpoint
 
 
 class TestUserAPIViews(EndpointTester):
     ''' Testing Authentication views. '''
 
     def setUp(self):
-        super().setUp()
+        super().setUpFullUsers()
 
 
     @decl_endpoint('/users/api/login', method='post')
     def test_login(self):
         self.logout()
         data = {'username': self.user.username, 'password': 'invalid'}
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         data = {'username': self.user.username, 'password': 'password'}
-        self.executeAccepted(data)
+        self.executeAccepted(data=data)
-        self.executeAccepted(data)
+        self.executeAccepted(data=data)
 
         self.logout()
         data = {'username': self.user.email, 'password': 'password'}
-        self.executeAccepted(data)
+        self.executeAccepted(data=data)
 
 
     @decl_endpoint('/users/api/logout', method='post')
@@ -59,7 +59,7 @@ class TestUserUserProfileAPIView(EndpointTester):
     ''' Testing User profile views. '''
 
     def setUp(self):
-        super().setUp()
+        super().setUpFullUsers()
         self.user.first_name = 'John'
         self.user.second_name = 'Smith'
         self.user.save()
@@ -84,7 +84,7 @@ class TestUserUserProfileAPIView(EndpointTester):
             'first_name': 'firstName',
             'last_name': 'lastName',
         }
-        response = self.executeOK(data)
+        response = self.executeOK(data=data)
         self.user.refresh_from_db()
         self.assertEqual(response.data['email'], '123@mail.ru')
         self.assertEqual(self.user.email, '123@mail.ru')
@@ -98,10 +98,10 @@ class TestUserUserProfileAPIView(EndpointTester):
             'first_name': 'new',
             'last_name': 'new2',
         }
-        self.executeOK(data)
+        self.executeOK(data=data)
 
         data = {'email': self.user2.email}
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         self.logout()
         self.executeForbidden()
@@ -113,14 +113,14 @@ class TestUserUserProfileAPIView(EndpointTester):
             'old_password': 'invalid',
             'new_password': 'password2'
         }
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         data = {
             'old_password': 'password',
             'new_password': 'password2'
         }
         oldHash = self.user.password
-        response = self.executeNoContent(data)
+        response = self.executeNoContent(data=data)
         self.user.refresh_from_db()
         self.assertNotEqual(self.user.password, oldHash)
         self.assertTrue(self.client.login(username=self.user.username, password='password2'))
@@ -154,7 +154,7 @@ class TestSignupAPIView(EndpointTester):
             'first_name': 'firstName',
             'last_name': 'lastName'
         }
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         data = {
             'username': 'NewUser',
@@ -164,7 +164,7 @@ class TestSignupAPIView(EndpointTester):
             'first_name': 'firstName',
             'last_name': 'lastName'
         }
-        response = self.executeCreated(data)
+        response = self.executeCreated(data=data)
         self.assertTrue('id' in response.data)
         self.assertEqual(response.data['username'], data['username'])
         self.assertEqual(response.data['email'], data['email'])
@@ -179,7 +179,7 @@ class TestSignupAPIView(EndpointTester):
             'first_name': 'firstName',
             'last_name': 'lastName'
         }
-        self.executeBadData(data)
+        self.executeBadData(data=data)
 
         data = {
             'username': 'NewUser2',
@@ -189,4 +189,4 @@ class TestSignupAPIView(EndpointTester):
             'first_name': 'firstName',
             'last_name': 'lastName'
         }
-        self.executeBadData(data)
+        self.executeBadData(data=data)

rsconcept/backend/project/settings.py

@@ -74,6 +74,7 @@ INSTALLED_APPS = [
 
     'apps.users',
     'apps.rsform',
+    'apps.oss',
 
     'drf_spectacular',
     'drf_spectacular_sidecar',

rsconcept/backend/project/urls.py

@@ -9,6 +9,7 @@ from drf_spectacular.views import SpectacularAPIView, SpectacularRedocView, Spec
 urlpatterns = [
     path('admin', admin.site.urls),
     path('api/', include('apps.rsform.urls')),
+    path('api/', include('apps.oss.urls')),
     path('users/', include('apps.users.urls')),
     path('schema', SpectacularAPIView.as_view(), name='schema'),
     path('redoc', SpectacularRedocView.as_view()),

rsconcept/backend/requirements-dev.txt

@@ -14,7 +14,6 @@ psycopg2-binary
 gunicorn
 
 djangorestframework-stubs[compatible-mypy]
-
 mypy
 pylint
 coverage

rsconcept/backend/requirements.txt

@@ -1,13 +1,13 @@
 tzdata==2024.1
-Django==5.0.6
+Django==5.0.7
-djangorestframework==3.15.1
+djangorestframework==3.15.2
-django-cors-headers==4.3.1
+django-cors-headers==4.4.0
 django-filter==24.2
 drf-spectacular==0.27.2
-drf-spectacular-sidecar==2024.6.1
+drf-spectacular-sidecar==2024.7.1
 coreapi==2.3.3
 django-rest-passwordreset==1.4.1
-cctext==0.1.3
+cctext==0.1.4
 pyconcept==0.1.6
 
 psycopg2-binary==2.9.9

rsconcept/backend/shared/EndpointTester.py

@@ -26,6 +26,21 @@ class EndpointTester(APITestCase):
     ''' Abstract base class for Testing endpoints. '''
 
     def setUp(self):
+        self.factory = APIRequestFactory()
+        self.user = User.objects.create(
+            username='UserTest',
+            email='blank@test.com',
+            password='password'
+        )
+        self.user2 = User.objects.create(
+            username='UserTest2',
+            email='another@test.com',
+            password='password'
+        )
+        self.client = APIClient()
+        self.client.force_authenticate(user=self.user)
+
+    def setUpFullUsers(self):
         self.factory = APIRequestFactory()
         self.user = User.objects.create_user(
             username='UserTest',

rsconcept/backend/shared/__init__.py

@@ -0,0 +1 @@
+''' Utilities shared between applications. '''

rsconcept/backend/shared/messages.py

@@ -6,6 +6,10 @@ def constituentaNotOwned(title: str):
     return f'Конституента не принадлежит схеме: {title}'
 
 
+def operationNotOwned(title: str):
+    return f'Операция не принадлежит схеме: {title}'
+
+
 def substitutionNotInList():
     return 'Отождествляемая конституента отсутствует в списке'
 
@@ -64,3 +68,15 @@ def constituentaNoStructure():
 
 def missingFile():
     return 'Отсутствует прикрепленный файл'
+
+
+def passwordAuthFailed():
+    return 'Неизвестное сочетание имени пользователя (email) и пароля'
+
+
+def passwordsNotMatch():
+    return 'Введенные пароли не совпадают'
+
+
+def emailAlreadyTaken():
+    return 'Пользователь с данным email уже существует'

rsconcept/backend/shared/permissions.py

@@ -11,16 +11,27 @@ from rest_framework.permissions import \
 from rest_framework.request import Request
 from rest_framework.views import APIView
 
-from . import models as m
+from apps.oss.models import Operation
+from apps.rsform.models import (
+    AccessPolicy,
+    Constituenta,
+    Editor,
+    LibraryItem,
+    Subscription,
+    Version
+)
+from apps.users.models import User
 
 
-def _extract_item(obj: Any) -> m.LibraryItem:
+def _extract_item(obj: Any) -> LibraryItem:
-    if isinstance(obj, m.LibraryItem):
+    if isinstance(obj, LibraryItem):
         return obj
-    elif isinstance(obj, m.Constituenta):
+    elif isinstance(obj, Constituenta):
-        return cast(m.LibraryItem, obj.schema)
+        return cast(LibraryItem, obj.schema)
-    elif isinstance(obj, (m.Version, m.Subscription, m.Editor)):
+    elif isinstance(obj, Operation):
-        return cast(m.LibraryItem, obj.item)
+        return cast(LibraryItem, obj.oss)
+    elif isinstance(obj, (Version, Subscription, Editor)):
+        return cast(LibraryItem, obj.item)
     raise PermissionDenied({
         'message': 'Invalid type error. Please contact developers',
         'object_id': obj.id
@@ -60,10 +71,10 @@ class ItemEditor(ItemOwner):
         if request.user.is_anonymous:
             return False
         item = _extract_item(obj)
-        if m.Editor.objects.filter(
+        if Editor.objects.filter(
             item=item,
-            editor=cast(m.User, request.user)
+            editor=cast(User, request.user)
-        ).exists() and item.access_policy != m.AccessPolicy.PRIVATE:
+        ).exists() and item.access_policy != AccessPolicy.PRIVATE:
             return True
         return super().has_object_permission(request, view, obj)
 
@@ -76,7 +87,7 @@ class ItemAnyone(ItemEditor):
 
     def has_object_permission(self, request: Request, view: APIView, obj: Any) -> bool:
         item = _extract_item(obj)
-        if item.access_policy == m.AccessPolicy.PUBLIC:
+        if item.access_policy == AccessPolicy.PUBLIC:
             return True
         return super().has_object_permission(request, view, obj)
 

rsconcept/frontend/.env.local

@@ -1,5 +1,4 @@
 # Local build config
 
 VITE_PORTAL_BACKEND=http://localhost:8000
-VITE_PORTAL_FRONT_PORT=3000
+VITE_PORTAL_FRONT_PORT=3000
-VITE_PORTAL_FRONT_HTTPS=false

rsconcept/frontend/Dockerfile

@@ -1,26 +1,30 @@
 # ======== Multi-stage base ==========
-FROM node:bullseye-slim as node-base
+FROM node:22-bookworm-slim AS node-base
 RUN apt-get update -qq && \
     apt-get upgrade -y && \
     rm -rf /var/lib/apt/lists/*
 
 # ======= Build =======
 ARG BUILD_TYPE=production
-FROM node-base as builder
+FROM node-base AS builder
 
 WORKDIR /result
 
+RUN npm install -g typescript vite
+
 COPY ./ ./
 COPY ./env/.env.$BUILD_TYPE ./
 RUN rm -rf ./env
+
 RUN npm ci
-ENV NODE_ENV production
+
+ENV NODE_ENV=production
 RUN npm run build
 
 # ========= Server =======
-FROM node-base as product-server
+FROM node-base AS product-server
 
-ENV NODE_ENV production
+ENV NODE_ENV=production
 
 # Install serve util
 RUN npm install -g serve

rsconcept/frontend/Dockerfile.dev

@@ -1,14 +1,17 @@
 # ======== Multi-stage base ==========
-FROM node:bullseye-slim as node-base
+FROM node:22-bookworm-slim AS node-base
 RUN apt-get update -qq && \
     apt-get upgrade -y && \
     rm -rf /var/lib/apt/lists/*
 
 # ========= Server =======
-FROM node-base as product-server
+FROM node-base AS product-server
-ARG BUILD_TYPE=production
+ARG BUILD_TYPE=development
+
+ENV NODE_ENV=development
 
 WORKDIR /home
+RUN npm install -g vite
 
 COPY ./ ./
 COPY ./env/.env.$BUILD_TYPE ./

rsconcept/frontend/env/.env.development

@@ -2,4 +2,3 @@
 
 VITE_PORTAL_BACKEND=http://localhost:8002
 VITE_PORTAL_FRONT_PORT=3002
-VITE_PORTAL_FRONT_HTTPS=false

rsconcept/frontend/env/.env.production

@@ -2,4 +2,3 @@
 
 VITE_PORTAL_BACKEND=https://api.portal.acconcept.ru
 VITE_PORTAL_FRONT_PORT=443
-VITE_PORTAL_FRONT_HTTPS=true

rsconcept/frontend/env/.env.production.local

@@ -2,5 +2,4 @@
 
 VITE_PORTAL_BACKEND=https://localhost:8001
 VITE_PORTAL_FRONT_PORT=3001
-VITE_PORTAL_FRONT_HTTPS=true
 

rsconcept/frontend/package.json

@@ -13,50 +13,50 @@
   },
   "dependencies": {
     "@lezer/lr": "^1.4.1",
-    "@reactflow/core": "^11.11.4",
+    "@tanstack/react-table": "^8.19.3",
-    "@tanstack/react-table": "^8.17.3",
+    "@uiw/codemirror-themes": "^4.23.0",
-    "@uiw/codemirror-themes": "^4.22.2",
+    "@uiw/react-codemirror": "^4.23.0",
-    "@uiw/react-codemirror": "^4.22.2",
     "axios": "^1.7.2",
     "clsx": "^2.1.1",
-    "framer-motion": "^10.18.0",
+    "framer-motion": "^11.3.8",
     "js-file-download": "^0.4.12",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-error-boundary": "^4.0.13",
-    "react-icons": "^4.12.0",
+    "react-icons": "^5.2.1",
     "react-intl": "^6.6.8",
-    "react-loader-spinner": "^5.4.5",
+    "react-loader-spinner": "^6.1.6",
-    "react-pdf": "^9.0.0",
+    "react-pdf": "^9.1.0",
-    "react-router-dom": "^6.23.1",
+    "react-router-dom": "^6.25.1",
     "react-select": "^5.8.0",
     "react-tabs": "^6.0.2",
-    "react-toastify": "^9.1.3",
+    "react-toastify": "^10.0.5",
-    "react-tooltip": "^5.27.0",
+    "react-tooltip": "^5.27.1",
-    "reagraph": "^4.19.1",
+    "reactflow": "^11.11.4",
+    "reagraph": "^4.19.2",
     "use-debounce": "^10.0.1"
   },
   "devDependencies": {
     "@lezer/generator": "^1.7.1",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.14.7",
+    "@types/node": "^20.14.11",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^7.16.1",
-    "@typescript-eslint/parser": "^6.21.0",
+    "@typescript-eslint/parser": "^7.16.1",
     "@vitejs/plugin-react": "^4.3.1",
     "autoprefixer": "^10.4.19",
     "eslint": "^8.57.0",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-react-refresh": "^0.4.7",
+    "eslint-plugin-react-refresh": "^0.4.8",
-    "eslint-plugin-simple-import-sort": "^10.0.0",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
-    "eslint-plugin-tsdoc": "^0.2.17",
+    "eslint-plugin-tsdoc": "^0.3.0",
     "jest": "^29.7.0",
-    "postcss": "^8.4.38",
+    "postcss": "^8.4.39",
-    "tailwindcss": "^3.4.4",
+    "tailwindcss": "^3.4.6",
-    "ts-jest": "^29.1.5",
+    "ts-jest": "^29.2.3",
-    "typescript": "^5.5.2",
+    "typescript": "^5.5.3",
-    "vite": "^4.5.3"
+    "vite": "^5.3.4"
   },
   "jest": {
     "preset": "ts-jest",

rsconcept/frontend/public/robots.txt

@@ -1,2 +1,5 @@
 User-agent: *
-Disallow: /library
+Disallow: /library
+Disallow: /restore-password
+Disallow: /signup
+Disallow: /profile

rsconcept/frontend/src/app/ApplicationLayout.tsx

@@ -3,8 +3,8 @@ import { Outlet } from 'react-router-dom';
 import ConceptToaster from '@/app/ConceptToaster';
 import Footer from '@/app/Footer';
 import Navigation from '@/app/Navigation';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { NavigationState } from '@/context/NavigationContext';
-import { useConceptOptions } from '@/context/OptionsContext';
 import { globals } from '@/utils/constants';
 
 function ApplicationLayout() {

rsconcept/frontend/src/app/ConceptToaster.tsx

@@ -1,6 +1,6 @@
 import { ToastContainer, type ToastContainerProps } from 'react-toastify';
 
-import { useConceptOptions } from '@/context/OptionsContext';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 
 interface ToasterThemedProps extends Omit<ToastContainerProps, 'theme'> {}
 

rsconcept/frontend/src/app/Footer.tsx

@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { useConceptOptions } from '@/context/OptionsContext';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { external_urls } from '@/utils/constants';
 
 import TextURL from '../components/ui/TextURL';

rsconcept/frontend/src/app/GlobalProviders.tsx

@@ -5,8 +5,8 @@ import { IntlProvider } from 'react-intl';
 import { pdfjs } from 'react-pdf';
 
 import { AuthState } from '@/context/AuthContext';
+import { OptionsState } from '@/context/ConceptOptionsContext';
 import { LibraryState } from '@/context/LibraryContext';
-import { OptionsState } from '@/context/OptionsContext';
 import { UsersState } from '@/context/UsersContext';
 
 import ErrorFallback from './ErrorFallback';

rsconcept/frontend/src/app/Navigation/Logo.tsx

@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { useConceptOptions } from '@/context/OptionsContext';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import useWindowSize from '@/hooks/useWindowSize';
 
 function Logo() {

rsconcept/frontend/src/app/Navigation/Navigation.tsx

@@ -3,14 +3,14 @@ import { motion } from 'framer-motion';
 
 import { IconLibrary2, IconManuals, IconNewItem2 } from '@/components/Icons';
 import { CProps } from '@/components/props';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
-import { useConceptOptions } from '@/context/OptionsContext';
 import { animateNavigation } from '@/styling/animations';
 
 import { urls } from '../urls';
 import Logo from './Logo';
 import NavigationButton from './NavigationButton';
-import ToggleNavigationButton from './ToggleNavigationButton';
+import ToggleNavigation from './ToggleNavigation';
 import UserMenu from './UserMenu';
 
 function Navigation() {
@@ -33,7 +33,7 @@ function Navigation() {
         'select-none'
       )}
     >
-      <ToggleNavigationButton />
+      <ToggleNavigation />
       <motion.div
         className={clsx(
           'pl-2 pr-[0.9rem] h-[3rem] w-full', // prettier: split lines
@@ -48,19 +48,9 @@ function Navigation() {
           <Logo />
         </div>
         <div className='flex gap-1 py-[0.3rem]'>
-          <NavigationButton
+          <NavigationButton text='Новая схема' icon={<IconNewItem2 size='1.5rem' />} onClick={navigateCreateNew} />
-            text='Новая схема'
+          <NavigationButton text='Библиотека' icon={<IconLibrary2 size='1.5rem' />} onClick={navigateLibrary} />
-            title='Создать новую схему'
+          <NavigationButton text='Справка' icon={<IconManuals size='1.5rem' />} onClick={navigateHelp} />
-            icon={<IconNewItem2 size='1.5rem' />}
-            onClick={navigateCreateNew}
-          />
-          <NavigationButton
-            text='Библиотека'
-            title='Список схем'
-            icon={<IconLibrary2 size='1.5rem' />}
-            onClick={navigateLibrary}
-          />
-          <NavigationButton text='Справка' title='Справочные материалы' icon={<IconManuals />} onClick={navigateHelp} />
           <UserMenu />
         </div>
       </motion.div>

rsconcept/frontend/src/app/Navigation/ToggleNavigation.tsx

@@ -2,11 +2,11 @@ import clsx from 'clsx';
 import { motion } from 'framer-motion';
 
 import { IconPin, IconUnpin } from '@/components/Icons';
-import { useConceptOptions } from '@/context/OptionsContext';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { animateNavigationToggle } from '@/styling/animations';
 import { globals } from '@/utils/constants';
 
-function ToggleNavigationButton() {
+function ToggleNavigation() {
   const { noNavigationAnimation, toggleNoNavigation } = useConceptOptions();
   return (
     <motion.button
@@ -31,4 +31,4 @@ function ToggleNavigationButton() {
   );
 }
 
-export default ToggleNavigationButton;
+export default ToggleNavigation;

rsconcept/frontend/src/app/Navigation/UserDropdown.tsx

@@ -13,8 +13,8 @@ import { CProps } from '@/components/props';
 import Dropdown from '@/components/ui/Dropdown';
 import DropdownButton from '@/components/ui/DropdownButton';
 import { useAuth } from '@/context/AuthContext';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
-import { useConceptOptions } from '@/context/OptionsContext';
 
 import { urls } from '../urls';
 

rsconcept/frontend/src/app/Navigation/UserMenu.tsx

@@ -4,8 +4,8 @@ import { IconLogin, IconUser2 } from '@/components/Icons';
 import Loader from '@/components/ui/Loader';
 import AnimateFade from '@/components/wrap/AnimateFade';
 import { useAuth } from '@/context/AuthContext';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { useConceptNavigation } from '@/context/NavigationContext';
-import { useConceptOptions } from '@/context/OptionsContext';
 import useDropdown from '@/hooks/useDropdown';
 
 import { urls } from '../urls';

rsconcept/frontend/src/app/backendAPI.ts

@@ -6,11 +6,18 @@ import axios, { AxiosError, AxiosRequestConfig } from 'axios';
 import { toast } from 'react-toastify';
 
 import { type ErrorData } from '@/components/info/InfoError';
-import { ILexemeData, IResolutionData, ITextRequest, ITextResult, IWordFormPlain } from '@/models/language';
+import { ILexemeData, ITextRequest, ITextResult, IWordFormPlain } from '@/models/language';
-import { ILibraryItem, ILibraryUpdateData, ITargetAccessPolicy, ITargetLocation, IVersionData } from '@/models/library';
+import {
+  AccessPolicy,
+  ILibraryItem,
+  ILibraryUpdateData,
+  ITargetAccessPolicy,
+  ITargetLocation,
+  IVersionData,
+  LibraryItemType
+} from '@/models/library';
 import { ILibraryCreateData } from '@/models/library';
-import { IOperationSchemaData, IRunSynthesis, IRunSynthesisResponse } from '@/models/oss';
+import { IOperationSchemaData } from '@/models/oss';
-import { ISynthesisGraphData } from '@/models/oss.ts';
 import {
   IConstituentaList,
   IConstituentaMeta,
@@ -78,7 +85,6 @@ interface IFrontRequest<RequestData, ResponseData> {
 export interface FrontPush<DataType> extends IFrontRequest<DataType, undefined> {
   data: DataType;
 }
-
 export interface FrontPull<DataType> extends IFrontRequest<undefined, DataType> {
   onSuccess: DataCallback<DataType>;
 }
@@ -228,10 +234,27 @@ export function postCloneLibraryItem(target: string, request: FrontExchange<IRSF
 }
 
 export function getOssDetails(target: string, request: FrontPull<IOperationSchemaData>) {
-  AxiosGet({
+  request.setLoading!(false);
-    endpoint: `/api/synthesis/${target}`,
+  request.onSuccess({
-    request: request
+    id: Number(target),
+    comment: '123',
+    alias: 'oss1',
+    access_policy: AccessPolicy.PUBLIC,
+    editors: [],
+    owner: 1,
+    item_type: LibraryItemType.OSS,
+    location: '/U',
+    read_only: false,
+    subscribers: [],
+    time_create: '0',
+    time_update: '0',
+    title: 'TestOss',
+    visible: false
   });
+  // AxiosGet({
+  //   endpoint: `/api/oss/${target}`, // TODO: endpoint to access OSS
+  //   request: request
+  // });
 }
 
 export function getRSFormDetails(target: string, version: string, request: FrontPull<IRSFormData>) {
@@ -415,35 +438,13 @@ export function patchUploadTRS(target: string, request: FrontExchange<IRSFormUpl
     }
   });
 }
-
+export function patchInlineSynthesis(request: FrontExchange<IInlineSynthesisData, IRSFormData>) {
-export function patchInlineSynthesis(request: FrontExchange<ISynthesisGraphData, ISynthesisGraphData>) {
   AxiosPatch({
     endpoint: `/api/operations/inline-synthesis`,
     request: request
   });
 }
 
-export function runSingleSynthesis(request: FrontExchange<IRunSynthesis, IRunSynthesisResponse>) {
-  AxiosPost({
-    endpoint: `/api/synthesis/run_single`,
-    request: request
-  });
-}
-
-export function postSynthesisGraph(request: FrontExchange<ISynthesisGraphData, ISynthesisGraphData>) {
-  AxiosPost({
-    endpoint: `/api/synthesis/save`,
-    request: request
-  });
-}
-
-export function postResolveText(schema: string, request: FrontExchange<ITextRequest, IResolutionData>) {
-  AxiosPost({
-    endpoint: `/api/rsforms/${schema}/resolve`,
-    request: request
-  });
-}
-
 export function postInflectText(request: FrontExchange<IWordFormPlain, ITextResult>) {
   AxiosPost({
     endpoint: `/api/cctext/inflect`,

rsconcept/frontend/src/components/RSInput/RSInput.tsx

@@ -9,7 +9,7 @@ import { EditorView } from 'codemirror';
 import { forwardRef, useCallback, useMemo, useRef } from 'react';
 
 import Label from '@/components/ui/Label';
-import { useConceptOptions } from '@/context/OptionsContext';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { getFontClassName } from '@/models/miscellaneousAPI';
 import { ConstituentaID, IRSForm } from '@/models/rsform';
 import { generateAlias, getCstTypePrefix, guessCstType } from '@/models/rsformAPI';

rsconcept/frontend/src/components/RefsInput/RefsInput.tsx

@@ -10,7 +10,7 @@ import { AnimatePresence } from 'framer-motion';
 import { forwardRef, useCallback, useMemo, useRef, useState } from 'react';
 
 import Label from '@/components/ui/Label';
-import { useConceptOptions } from '@/context/OptionsContext';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import DlgEditReference from '@/dialogs/DlgEditReference';
 import { ReferenceType } from '@/models/language';
 import { ConstituentaID, IRSForm } from '@/models/rsform';

rsconcept/frontend/src/components/info/BadgeConstituenta.tsx

@@ -1,10 +1,11 @@
 import clsx from 'clsx';
 
-import ConstituentaTooltip from '@/components/info/ConstituentaTooltip';
 import { IConstituenta } from '@/models/rsform';
 import { isMockCst } from '@/models/rsformAPI';
 import { colorFgCstStatus, IColorTheme } from '@/styling/color';
 
+import TooltipConstituenta from './TooltipConstituenta';
+
 interface BadgeConstituentaProps {
   prefixID?: string;
   value: IConstituenta;
@@ -28,7 +29,7 @@ function BadgeConstituenta({ value, prefixID, theme }: BadgeConstituentaProps) {
       }}
     >
       {value.alias}
-      <ConstituentaTooltip anchor={`#${prefixID}${value.alias}`} data={value} />
+      <TooltipConstituenta anchor={`#${prefixID}${value.alias}`} data={value} />
     </div>
   );
 }

rsconcept/frontend/src/components/info/BadgeGrammeme.tsx

@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { useConceptOptions } from '@/context/OptionsContext';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { GramData } from '@/models/language';
 import { colorFgGrammeme } from '@/styling/color';
 import { labelGrammeme } from '@/utils/labels';

rsconcept/frontend/src/components/info/BadgeHelp.tsx

@@ -2,7 +2,7 @@ import clsx from 'clsx';
 
 import TextURL from '@/components/ui/TextURL';
 import Tooltip, { PlacesType } from '@/components/ui/Tooltip';
-import { useConceptOptions } from '@/context/OptionsContext';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { HelpTopic } from '@/models/miscellaneous';
 
 import TopicPage from '../../pages/ManualsPage/TopicPage';

rsconcept/frontend/src/components/info/InfoCstClass.tsx

@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { useConceptOptions } from '@/context/OptionsContext';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { CstClass } from '@/models/rsform';
 import { colorBgCstClass } from '@/styling/color';
 import { prefixes } from '@/utils/constants';

rsconcept/frontend/src/components/info/InfoCstStatus.tsx

@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 
-import { useConceptOptions } from '@/context/OptionsContext';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { ExpressionStatus } from '@/models/rsform';
 import { colorBgCstStatus } from '@/styling/color';
 import { prefixes } from '@/utils/constants';

rsconcept/frontend/src/components/info/TooltipConstituenta.tsx

@@ -2,12 +2,12 @@ import InfoConstituenta from '@/components/info/InfoConstituenta';
 import Tooltip from '@/components/ui/Tooltip';
 import { IConstituenta } from '@/models/rsform';
 
-interface ConstituentaTooltipProps {
+interface TooltipConstituentaProps {
   data: IConstituenta;
   anchor: string;
 }
 
-function ConstituentaTooltip({ data, anchor }: ConstituentaTooltipProps) {
+function TooltipConstituenta({ data, anchor }: TooltipConstituentaProps) {
   return (
     <Tooltip clickable layer='z-modalTooltip' anchorSelect={anchor} className='max-w-[30rem]'>
       <InfoConstituenta data={data} onClick={event => event.stopPropagation()} />
@@ -15,4 +15,4 @@ function ConstituentaTooltip({ data, anchor }: ConstituentaTooltipProps) {
   );
 }
 
-export default ConstituentaTooltip;
+export default TooltipConstituenta;

rsconcept/frontend/src/components/select/PickConstituenta.tsx

@@ -4,7 +4,7 @@ import { useEffect, useMemo, useState } from 'react';
 
 import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/ui/DataTable';
 import SearchBar from '@/components/ui/SearchBar';
-import { useConceptOptions } from '@/context/OptionsContext';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { CstMatchMode } from '@/models/miscellaneous';
 import { IConstituenta } from '@/models/rsform';
 import { matchConstituenta } from '@/models/rsformAPI';

rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx

@@ -4,14 +4,14 @@ import clsx from 'clsx';
 import { useLayoutEffect, useMemo, useState } from 'react';
 
 import DataTable, { createColumnHelper, RowSelectionState } from '@/components/ui/DataTable';
-import { useConceptOptions } from '@/context/OptionsContext';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { ConstituentaID, IConstituenta, IRSForm } from '@/models/rsform';
 import { isBasicConcept } from '@/models/rsformAPI';
 import { describeConstituenta } from '@/utils/labels';
 
 import BadgeConstituenta from '../info/BadgeConstituenta';
 import NoData from '../ui/NoData';
-import GraphSelectionToolbar from './GraphSelectionToolbar';
+import ToolbarGraphSelection from './ToolbarGraphSelection';
 
 interface PickMultiConstituentaProps {
   id?: string;
@@ -80,7 +80,7 @@ function PickMultiConstituenta({ id, schema, prefixID, rows, selected, setSelect
           Выбраны {selected.length} из {schema?.items.length ?? 0}
         </span>
         {schema ? (
-          <GraphSelectionToolbar
+          <ToolbarGraphSelection
             graph={schema.graph}
             core={schema.items.filter(cst => isBasicConcept(cst.cst_type)).map(cst => cst.id)}
             setSelected={setSelected}

rsconcept/frontend/src/components/select/PickSchema.tsx

@@ -3,8 +3,8 @@ import { useIntl } from 'react-intl';
 
 import DataTable, { createColumnHelper, IConditionalStyle } from '@/components/ui/DataTable';
 import SearchBar from '@/components/ui/SearchBar';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { useLibrary } from '@/context/LibraryContext';
-import { useConceptOptions } from '@/context/OptionsContext';
 import { ILibraryItem, LibraryItemID, LibraryItemType } from '@/models/library';
 import { ILibraryFilter } from '@/models/miscellaneous';
 

rsconcept/frontend/src/components/select/PickSubstitutions.tsx

@@ -7,7 +7,7 @@ import SelectConstituenta from '@/components/select/SelectConstituenta';
 import DataTable, { createColumnHelper } from '@/components/ui/DataTable';
 import Label from '@/components/ui/Label';
 import MiniButton from '@/components/ui/MiniButton';
-import { useConceptOptions } from '@/context/OptionsContext';
+import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { IConstituenta, IRSForm, ISubstitution } from '@/models/rsform';
 import { describeConstituenta } from '@/utils/labels';
 

rsconcept/frontend/src/components/select/SelectLocation.tsx

@@ -1,40 +1,109 @@
 'use client';
 
-import { useCallback } from 'react';
+import clsx from 'clsx';
+import { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 
-import useDropdown from '@/hooks/useDropdown';
+import { FolderNode, FolderTree } from '@/models/FolderTree';
-import { FolderTree } from '@/models/FolderTree';
+import { labelFolderNode } from '@/utils/labels';
 
-import { IconFolderTree } from '../Icons';
+import { IconFolder, IconFolderClosed, IconFolderEmpty, IconFolderOpened } from '../Icons';
+import { CProps } from '../props';
 import MiniButton from '../ui/MiniButton';
 
-interface SelectLocationProps {
+interface SelectLocationProps extends CProps.Styling {
   value: string;
-  onChange: (newValue: string) => void;
-
   folderTree: FolderTree;
+  prefix: string;
+  dense?: boolean;
+  onClick: (event: CProps.EventMouse, target: FolderNode) => void;
 }
 
-function SelectLocation({ value, onChange, folderTree }: SelectLocationProps) {
+function SelectLocation({ value, folderTree, dense, prefix, onClick, className, style }: SelectLocationProps) {
-  const menu = useDropdown();
+  const activeNode = useMemo(() => folderTree.at(value), [folderTree, value]);
 
-  const handleChange = useCallback(
+  const items = useMemo(() => folderTree.getTree(), [folderTree]);
-    (newValue: string) => {
+  const [folded, setFolded] = useState<FolderNode[]>(items);
-      console.log(folderTree.roots.size);
+
-      console.log(value);
+  useLayoutEffect(() => {
-      menu.hide();
+    setFolded(items.filter(item => item !== activeNode && (!activeNode || !activeNode.hasPredecessor(item))));
-      onChange(newValue);
+  }, [items, activeNode]);
+
+  const onFoldItem = useCallback(
+    (target: FolderNode, showChildren: boolean) => {
+      setFolded(prev =>
+        items.filter(item => {
+          if (item === target) {
+            return !showChildren;
+          }
+          if (!showChildren && item.hasPredecessor(target)) {
+            return true;
+          } else {
+            return prev.includes(item);
+          }
+        })
+      );
     },
-    [menu, onChange, value, folderTree]
+    [items]
+  );
+
+  const handleClickFold = useCallback(
+    (event: CProps.EventMouse, target: FolderNode, showChildren: boolean) => {
+      event.preventDefault();
+      event.stopPropagation();
+      onFoldItem(target, showChildren);
+    },
+    [onFoldItem]
   );
 
   return (
-    <div ref={menu.ref} className='h-full text-right'>
+    <div className={clsx('flex flex-col', 'cc-scroll-y', className)} style={style}>
-      <MiniButton
+      {items.map((item, index) =>
-        title='Проводник...'
+        !item.parent || !folded.includes(item.parent) ? (
-        icon={<IconFolderTree size='1.25rem' className='icon-green' />}
+          <div
-        onClick={() => handleChange('/U/test')}
+            tabIndex={-1}
-      />
+            key={`${prefix}${index}`}
+            className={clsx(
+              !dense && 'min-h-[2.0825rem] sm:min-h-[2.3125rem]',
+              'pr-3 py-1 flex items-center gap-2',
+              'cc-scroll-row',
+              'clr-hover',
+              'cursor-pointer',
+              'leading-3 sm:leading-4',
+              activeNode === item && 'clr-selected'
+            )}
+            style={{ paddingLeft: `${(item.rank > 5 ? 5 : item.rank) * 0.5 + 0.5}rem` }}
+            onClick={event => onClick(event, item)}
+          >
+            {item.children.size > 0 ? (
+              <MiniButton
+                noPadding
+                noHover
+                icon={
+                  folded.includes(item) ? (
+                    item.filesInside ? (
+                      <IconFolderClosed size='1rem' className='icon-primary' />
+                    ) : (
+                      <IconFolderEmpty size='1rem' className='icon-primary' />
+                    )
+                  ) : (
+                    <IconFolderOpened size='1rem' className='icon-green' />
+                  )
+                }
+                onClick={event => handleClickFold(event, item, folded.includes(item))}
+              />
+            ) : (
+              <div>
+                {item.filesInside ? (
+                  <IconFolder size='1rem' className='clr-text-default' />
+                ) : (
+                  <IconFolderEmpty size='1rem' className='clr-text-controls' />
+                )}
+              </div>
+            )}
+            <div className='self-center text-start'>{labelFolderNode(item)}</div>
+          </div>
+        ) : null
+      )}
     </div>
   );
 }

rsconcept/frontend/src/components/select/SelectLocationContext.tsx

@@ -0,0 +1,62 @@
+'use client';
+
+import clsx from 'clsx';
+import { useCallback } from 'react';
+
+import useDropdown from '@/hooks/useDropdown';
+import { FolderTree } from '@/models/FolderTree';
+import { prefixes } from '@/utils/constants';
+
+import { IconFolderTree } from '../Icons';
+import { CProps } from '../props';
+import Dropdown from '../ui/Dropdown';
+import MiniButton from '../ui/MiniButton';
+import SelectLocation from './SelectLocation';
+
+interface SelectLocationContextProps extends CProps.Styling {
+  value: string;
+  folderTree: FolderTree;
+  stretchTop?: boolean;
+
+  onChange: (newValue: string) => void;
+}
+
+function SelectLocationContext({ value, folderTree, onChange, className, style }: SelectLocationContextProps) {
+  const menu = useDropdown();
+
+  const handleClick = useCallback(
+    (event: CProps.EventMouse, newValue: string) => {
+      event.preventDefault();
+      event.stopPropagation();
+      menu.hide();
+      onChange(newValue);
+    },
+    [menu, onChange]
+  );
+
+  return (
+    <div ref={menu.ref} className='h-full text-right self-start mt-[-0.25rem] ml-[-1.5rem]'>
+      <MiniButton
+        title='Проводник...'
+        hideTitle={menu.isOpen}
+        icon={<IconFolderTree size='1.25rem' className='icon-green' />}
+        onClick={() => menu.toggle()}
+      />
+      <Dropdown
+        isOpen={menu.isOpen}
+        className={clsx('w-[20rem] h-[12.5rem] z-modalTooltip mt-0', className)}
+        style={style}
+      >
+        <SelectLocation
+          folderTree={folderTree}
+          value={value}
+          prefix={prefixes.folders_list}
+          dense
+          onClick={(event, target) => handleClick(event, target.getPath())}
+        />
+      </Dropdown>
+    </div>
+  );
+}
+
+export default SelectLocationContext;

rsconcept/frontend/src/components/select/SelectWordForm.tsx

@@ -6,7 +6,7 @@ import { Grammeme } from '@/models/language';
 import { prefixes } from '@/utils/constants';
 import { DefaultWordForms, IGrammemeOption, SelectorGrammemes } from '@/utils/selectors';
 
-import WordformButton from './WordformButton';
+import WordformButton from '../../dialogs/DlgEditReference/WordformButton';
 
 interface SelectWordFormProps {
   selected: IGrammemeOption[];