From d5e7fe4371e7d6bc8f69a38179e1bc0806b6bd57 Mon Sep 17 00:00:00 2001 From: Ivan <8611739+IRBorisov@users.noreply.github.com> Date: Tue, 5 Aug 2025 14:02:06 +0300 Subject: [PATCH] M: Minor UI updates --- rsconcept/frontend/public/db_schema.svg | 1997 +++++++++-------- .../dialogs/dlg-edit-cst/form-edit-cst.tsx | 4 +- 2 files changed, 1098 insertions(+), 903 deletions(-) diff --git a/rsconcept/frontend/public/db_schema.svg b/rsconcept/frontend/public/db_schema.svg index ea053349..b9768262 100644 --- a/rsconcept/frontend/public/db_schema.svg +++ b/rsconcept/frontend/public/db_schema.svg @@ -1,1100 +1,1295 @@ - - + + model_graph - - -cluster_django_contrib_auth - -           -           -django.contrib.auth -           -           - + cluster_django_contrib_admin - -           -           -django.contrib.admin -           -           + +           +           +django.contrib.admin +           +           + + +cluster_django_contrib_auth + +           +           +django.contrib.auth +           +           cluster_django_contrib_contenttypes - -           -           -django.contrib.contenttypes -           -           + +           +           +django.contrib.contenttypes +           +           cluster_django_contrib_sessions - -           -           -django.contrib.sessions -           -           + +           +           +django.contrib.sessions +           +           cluster_django_rest_passwordreset - -           -           -django_rest_passwordreset -           -           + +           +           +django_rest_passwordreset +           +           cluster_apps_library - -           -           -apps.library -           -           + +           +           +apps.library +           +           cluster_apps_rsform - -           -           -apps.rsform -           -           + +           +           +apps.rsform +           +           cluster_apps_oss - -           -           -apps.oss -           -           + +           +           +apps.oss +           +           + + +cluster_apps_prompt + +           +           +apps.prompt +           +           django_contrib_admin_models_LogEntry - - -       -      LogEntry       -       -id -       -       -AutoField -       -       -content_type -       -       -ForeignKey (id) -       -       -user -       -       -ForeignKey (id) -       -       -action_flag -       -       -PositiveSmallIntegerField -       -       -action_time -       -       -DateTimeField -       -       -change_message -       -       -TextField -       -       -object_id -       -       -TextField -       -       -object_repr -       -       -CharField -       - + + +       +      LogEntry       +       +id +       +       +AutoField +       +       +content_type +       +       +ForeignKey (id) +       +       +user +       +       +ForeignKey (id) +       +       +action_flag +       +       +PositiveSmallIntegerField +       +       +action_time +       +       +DateTimeField +       +       +change_message +       +       +TextField +       +       +object_id +       +       +TextField +       +       +object_repr +       +       +CharField +       + django_contrib_auth_models_User - - -       -      User -< -AbstractUser ->       -       -id -       -       -AutoField -       -       -date_joined -       -       -DateTimeField -       -       -email -       -       -EmailField -       -       -first_name -       -       -CharField -       -       -is_active -       -       -BooleanField -       -       -is_staff -       -       -BooleanField -       -       -is_superuser -       -       -BooleanField -       -       -last_login -       -       -DateTimeField -       -       -last_name -       -       -CharField -       -       -password -       -       -CharField -       -       -username -       -       -CharField -       - + + +       +      User +< +AbstractUser +>       +       +id +       +       +AutoField +       +       +date_joined +       +       +DateTimeField +       +       +email +       +       +EmailField +       +       +first_name +       +       +CharField +       +       +is_active +       +       +BooleanField +       +       +is_staff +       +       +BooleanField +       +       +is_superuser +       +       +BooleanField +       +       +last_login +       +       +DateTimeField +       +       +last_name +       +       +CharField +       +       +password +       +       +CharField +       +       +username +       +       +CharField +       + django_contrib_admin_models_LogEntry->django_contrib_auth_models_User - - - user (logentry) + + + user (logentry) django_contrib_contenttypes_models_ContentType - - -       -      ContentType       -       -id -       -       -AutoField -       -       -app_label -       -       -CharField -       -       -model -       -       -CharField -       - + + +       +      ContentType       +       +id +       +       +AutoField +       +       +app_label +       +       +CharField +       +       +model +       +       +CharField +       + django_contrib_admin_models_LogEntry->django_contrib_contenttypes_models_ContentType - - - content_type (logentry) + + + content_type (logentry) django_contrib_auth_models_AbstractUser - - -       -      AbstractUser -< -AbstractBaseUser,PermissionsMixin ->       -       -date_joined -       -       -DateTimeField -       -       -email -       -       -EmailField -       -       -first_name -       -       -CharField -       -       -is_active -       -       -BooleanField -       -       -is_staff -       -       -BooleanField -       -       -is_superuser -       -       -BooleanField -       -       -last_login -       -       -DateTimeField -       -       -last_name -       -       -CharField -       -       -password -       -       -CharField -       -       -username -       -       -CharField -       - + + +       +      AbstractUser +< +AbstractBaseUser,PermissionsMixin +>       +       +date_joined +       +       +DateTimeField +       +       +email +       +       +EmailField +       +       +first_name +       +       +CharField +       +       +is_active +       +       +BooleanField +       +       +is_staff +       +       +BooleanField +       +       +is_superuser +       +       +BooleanField +       +       +last_login +       +       +DateTimeField +       +       +last_name +       +       +CharField +       +       +password +       +       +CharField +       +       +username +       +       +CharField +       + - + django_contrib_auth_base_user_AbstractBaseUser - - -   -AbstractBaseUser -   + + +   +AbstractBaseUser +   django_contrib_auth_models_AbstractUser->django_contrib_auth_base_user_AbstractBaseUser - - - abstract -inheritance + + + abstract +inheritance - + django_contrib_auth_models_PermissionsMixin - - -   -PermissionsMixin -   + + +   +PermissionsMixin +   django_contrib_auth_models_AbstractUser->django_contrib_auth_models_PermissionsMixin - - - abstract -inheritance + + + abstract +inheritance django_contrib_auth_models_Permission - - -       -      Permission       -       -id -       -       -AutoField -       -       -content_type -       -       -ForeignKey (id) -       -       -codename -       -       -CharField -       -       -name -       -       -CharField -       - + + +       +      Permission       +       +id +       +       +AutoField +       +       +content_type +       +       +ForeignKey (id) +       +       +codename +       +       +CharField +       +       +name +       +       +CharField +       + django_contrib_auth_models_Permission->django_contrib_contenttypes_models_ContentType - - - content_type (permission) + + + content_type (permission) django_contrib_auth_models_Group - - -       -      Group       -       -id -       -       -AutoField -       -       -name -       -       -CharField -       - + + +       +      Group       +       +id +       +       +AutoField +       +       +name +       +       +CharField +       + django_contrib_auth_models_Group->django_contrib_auth_models_Permission - - - - permissions (group) + + + + permissions (group) django_contrib_auth_models_User->django_contrib_auth_models_AbstractUser - - - abstract -inheritance + + + abstract +inheritance django_contrib_auth_models_User->django_contrib_auth_models_Permission - - - - user_permissions (user) + + + + user_permissions (user) django_contrib_auth_models_User->django_contrib_auth_models_Group - - - - groups (user) + + + + groups (user) django_contrib_sessions_base_session_AbstractBaseSession - - -       -      AbstractBaseSession       -       -expire_date -       -       -DateTimeField -       -       -session_data -       -       -TextField -       - + + +       +      AbstractBaseSession       +       +expire_date +       +       +DateTimeField +       +       +session_data +       +       +TextField +       + django_contrib_sessions_models_Session - - -       -      Session -< -AbstractBaseSession ->       -       -session_key -       -       -CharField -       -       -expire_date -       -       -DateTimeField -       -       -session_data -       -       -TextField -       - + + +       +      Session +< +AbstractBaseSession +>       +       +session_key +       +       +CharField +       +       +expire_date +       +       +DateTimeField +       +       +session_data +       +       +TextField +       + django_contrib_sessions_models_Session->django_contrib_sessions_base_session_AbstractBaseSession - - - abstract -inheritance + + + abstract +inheritance django_rest_passwordreset_models_ResetPasswordToken - - -       -      ResetPasswordToken       -       -id -       -       -AutoField -       -       -user -       -       -ForeignKey (id) -       -       -created_at -       -       -DateTimeField -       -       -ip_address -       -       -GenericIPAddressField -       -       -key -       -       -CharField -       -       -user_agent -       -       -CharField -       - + + +       +      ResetPasswordToken       +       +id +       +       +AutoField +       +       +user +       +       +ForeignKey (id) +       +       +created_at +       +       +DateTimeField +       +       +ip_address +       +       +GenericIPAddressField +       +       +key +       +       +CharField +       +       +user_agent +       +       +CharField +       + django_rest_passwordreset_models_ResetPasswordToken->django_contrib_auth_models_User - - - user (password_reset_tokens) + + + user (password_reset_tokens) apps_library_models_Editor_Editor - - -       -      Editor       -       -id -       -       -BigAutoField -       -       -editor -       -       -ForeignKey (id) -       -       -item -       -       -ForeignKey (id) -       -       -time_create -       -       -DateTimeField -       - + + +       +      Editor       +       +id +       +       +BigAutoField +       +       +editor +       +       +ForeignKey (id) +       +       +item +       +       +ForeignKey (id) +       +       +time_create +       +       +DateTimeField +       + apps_library_models_Editor_Editor->django_contrib_auth_models_User - - - editor (editor) + + + editor (editor) apps_library_models_LibraryItem_LibraryItem - - -       -      LibraryItem       -       -id -       -       -BigAutoField -       -       -owner -       -       -ForeignKey (id) -       -       -access_policy -       -       -CharField -       -       -alias -       -       -CharField -       -       -comment -       -       -TextField -       -       -item_type -       -       -CharField -       -       -location -       -       -TextField -       -       -read_only -       -       -BooleanField -       -       -time_create -       -       -DateTimeField -       -       -time_update -       -       -DateTimeField -       -       -title -       -       -TextField -       -       -visible -       -       -BooleanField -       - + + +       +      LibraryItem       +       +id +       +       +BigAutoField +       +       +owner +       +       +ForeignKey (id) +       +       +access_policy +       +       +CharField +       +       +alias +       +       +CharField +       +       +description +       +       +TextField +       +       +item_type +       +       +CharField +       +       +location +       +       +TextField +       +       +read_only +       +       +BooleanField +       +       +time_create +       +       +DateTimeField +       +       +time_update +       +       +DateTimeField +       +       +title +       +       +TextField +       +       +visible +       +       +BooleanField +       + apps_library_models_Editor_Editor->apps_library_models_LibraryItem_LibraryItem - - - item (editor) + + + item (editor) apps_library_models_Version_Version - - -       -      Version       -       -id -       -       -BigAutoField -       -       -item -       -       -ForeignKey (id) -       -       -data -       -       -JSONField -       -       -description -       -       -TextField -       -       -time_create -       -       -DateTimeField -       -       -version -       -       -CharField -       - + + +       +      Version       +       +id +       +       +BigAutoField +       +       +item +       +       +ForeignKey (id) +       +       +data +       +       +JSONField +       +       +description +       +       +TextField +       +       +time_create +       +       +DateTimeField +       +       +version +       +       +CharField +       + apps_library_models_Version_Version->apps_library_models_LibraryItem_LibraryItem - - - item (version) + + + item (version) apps_library_models_LibraryItem_LibraryItem->django_contrib_auth_models_User - - - owner (libraryitem) + + + owner (libraryitem) apps_library_models_LibraryTemplate_LibraryTemplate - - -       -      LibraryTemplate       -       -id -       -       -BigAutoField -       -       -lib_source -       -       -ForeignKey (id) -       - + + +       +      LibraryTemplate       +       +id +       +       +BigAutoField +       +       +lib_source +       +       +ForeignKey (id) +       + apps_library_models_LibraryTemplate_LibraryTemplate->apps_library_models_LibraryItem_LibraryItem - - - lib_source (librarytemplate) + + + lib_source (librarytemplate) apps_rsform_models_Constituenta_Constituenta - - -       -      Constituenta       -       -id -       -       -BigAutoField -       -       -schema -       -       -ForeignKey (id) -       -       -alias -       -       -CharField -       -       -convention -       -       -TextField -       -       -cst_type -       -       -CharField -       -       -definition_formal -       -       -TextField -       -       -definition_raw -       -       -TextField -       -       -definition_resolved -       -       -TextField -       -       -order -       -       -PositiveIntegerField -       -       -term_forms -       -       -JSONField -       -       -term_raw -       -       -TextField -       -       -term_resolved -       -       -TextField -       - + + +       +      Constituenta       +       +id +       +       +BigAutoField +       +       +schema +       +       +ForeignKey (id) +       +       +alias +       +       +CharField +       +       +convention +       +       +TextField +       +       +crucial +       +       +BooleanField +       +       +cst_type +       +       +CharField +       +       +definition_formal +       +       +TextField +       +       +definition_raw +       +       +TextField +       +       +definition_resolved +       +       +TextField +       +       +order +       +       +PositiveIntegerField +       +       +term_forms +       +       +JSONField +       +       +term_raw +       +       +TextField +       +       +term_resolved +       +       +TextField +       + apps_rsform_models_Constituenta_Constituenta->apps_library_models_LibraryItem_LibraryItem - - - schema (constituenta) + + + schema (constituenta) apps_oss_models_Argument_Argument - - -       -      Argument       -       -id -       -       -BigAutoField -       -       -argument -       -       -ForeignKey (id) -       -       -operation -       -       -ForeignKey (id) -       -       -order -       -       -PositiveIntegerField -       - + + +       +      Argument       +       +id +       +       +BigAutoField +       +       +argument +       +       +ForeignKey (id) +       +       +operation +       +       +ForeignKey (id) +       +       +order +       +       +PositiveIntegerField +       + - + apps_oss_models_Operation_Operation - - -       -      Operation       -       -id -       -       -BigAutoField -       -       -oss -       -       -ForeignKey (id) -       -       -result -       -       -ForeignKey (id) -       -       -alias -       -       -CharField -       -       -comment -       -       -TextField -       -       -operation_type -       -       -CharField -       -       -position_x -       -       -FloatField -       -       -position_y -       -       -FloatField -       -       -title -       -       -TextField -       - + + +       +      Operation       +       +id +       +       +BigAutoField +       +       +oss +       +       +ForeignKey (id) +       +       +parent +       +       +ForeignKey (id) +       +       +result +       +       +ForeignKey (id) +       +       +alias +       +       +CharField +       +       +description +       +       +TextField +       +       +operation_type +       +       +CharField +       +       +title +       +       +TextField +       + apps_oss_models_Argument_Argument->apps_oss_models_Operation_Operation - - - operation (arguments) + + + operation (arguments) apps_oss_models_Argument_Argument->apps_oss_models_Operation_Operation - - - argument (descendants) + + + argument (descendants) + + + +apps_oss_models_Block_Block + + +       +      Block       +       +id +       +       +BigAutoField +       +       +oss +       +       +ForeignKey (id) +       +       +parent +       +       +ForeignKey (id) +       +       +description +       +       +TextField +       +       +title +       +       +TextField +       + + + + +apps_oss_models_Block_Block->apps_library_models_LibraryItem_LibraryItem + + + oss (blocks) + + + +apps_oss_models_Block_Block->apps_oss_models_Block_Block + + + parent (as_child_block) - + apps_oss_models_Inheritance_Inheritance - - -       -      Inheritance       -       -id -       -       -BigAutoField -       -       -child -       -       -ForeignKey (id) -       -       -operation -       -       -ForeignKey (id) -       -       -parent -       -       -ForeignKey (id) -       - + + +       +      Inheritance       +       +id +       +       +BigAutoField +       +       +child +       +       +ForeignKey (id) +       +       +operation +       +       +ForeignKey (id) +       +       +parent +       +       +ForeignKey (id) +       + - + apps_oss_models_Inheritance_Inheritance->apps_rsform_models_Constituenta_Constituenta - - - parent (as_parent) + + + parent (as_parent) - + apps_oss_models_Inheritance_Inheritance->apps_rsform_models_Constituenta_Constituenta - - - child (as_child) + + + child (as_child) - + apps_oss_models_Inheritance_Inheritance->apps_oss_models_Operation_Operation - - - operation (inheritances) + + + operation (inheritances) + + + +apps_oss_models_Layout_Layout + + +       +      Layout       +       +id +       +       +BigAutoField +       +       +oss +       +       +ForeignKey (id) +       +       +data +       +       +JSONField +       + + + + +apps_oss_models_Layout_Layout->apps_library_models_LibraryItem_LibraryItem + + + oss (layout) + + + +apps_oss_models_Reference_Reference + + +       +      Reference       +       +id +       +       +BigAutoField +       +       +reference +       +       +ForeignKey (id) +       +       +target +       +       +ForeignKey (id) +       + + + + +apps_oss_models_Reference_Reference->apps_oss_models_Operation_Operation + + + reference (references) + + + +apps_oss_models_Reference_Reference->apps_oss_models_Operation_Operation + + + target (targets) - + apps_oss_models_Substitution_Substitution - - -       -      Substitution       -       -id -       -       -BigAutoField -       -       -operation -       -       -ForeignKey (id) -       -       -original -       -       -ForeignKey (id) -       -       -substitution -       -       -ForeignKey (id) -       - + + +       +      Substitution       +       +id +       +       +BigAutoField +       +       +operation +       +       +ForeignKey (id) +       +       +original +       +       +ForeignKey (id) +       +       +substitution +       +       +ForeignKey (id) +       + - + apps_oss_models_Substitution_Substitution->apps_rsform_models_Constituenta_Constituenta - - - original (as_original) + + + original (as_original) - + apps_oss_models_Substitution_Substitution->apps_rsform_models_Constituenta_Constituenta - - - substitution (as_substitute) + + + substitution (as_substitute) - + apps_oss_models_Substitution_Substitution->apps_oss_models_Operation_Operation - - - operation (substitution) + + + operation (substitution) - + apps_oss_models_Operation_Operation->apps_library_models_LibraryItem_LibraryItem - - - oss (operations) + + + oss (operations) - + apps_oss_models_Operation_Operation->apps_library_models_LibraryItem_LibraryItem - - - result (producer) + + + result (producer) + + + +apps_oss_models_Operation_Operation->apps_oss_models_Block_Block + + + parent (as_child_operation) + + + +apps_prompt_models_PromptTemplate_PromptTemplate + + +       +      PromptTemplate       +       +id +       +       +BigAutoField +       +       +owner +       +       +ForeignKey (id) +       +       +description +       +       +TextField +       +       +is_shared +       +       +BooleanField +       +       +label +       +       +CharField +       +       +text +       +       +TextField +       + + + + +apps_prompt_models_PromptTemplate_PromptTemplate->django_contrib_auth_models_User + + + owner (prompt_templates) \ No newline at end of file diff --git a/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-cst/form-edit-cst.tsx b/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-cst/form-edit-cst.tsx index c6717054..c9fa3d73 100644 --- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-cst/form-edit-cst.tsx +++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-edit-cst/form-edit-cst.tsx @@ -74,7 +74,7 @@ export function FormEditCst({ target, schema }: FormEditCstProps) { fitContent spellCheck label='Термин' - className='max-h-15' + className='max-h-15 disabled:min-h-9' {...register('item_data.term_raw')} error={errors.item_data?.term_raw} /> @@ -158,7 +158,7 @@ export function FormEditCst({ target, schema }: FormEditCstProps) { fitContent spellCheck label={isBasic ? 'Конвенция' : 'Комментарий'} - className='max-h-20' + className='max-h-20 disabled:min-h-9' {...register('item_data.convention')} error={errors.item_data?.convention} disabled={isBasic && target.is_inherited}