From 99312f25ee20e538a853d5241dd914ad8062c50c Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Tue, 26 Aug 2025 14:00:39 +0300
Subject: [PATCH] M: Minor UI improvements

---
 .../library/pages/library-page/toolbar-search.tsx         | 8 ++++++--
 .../src/features/oss/components/select-parent.tsx         | 2 +-
 .../src/features/oss/dialogs/dlg-create-schema.tsx        | 8 ++++----
 .../src/features/oss/dialogs/dlg-import-schema.tsx        | 6 +++---
 .../oss/pages/oss-page/editor-oss-graph/oss-flow.tsx      | 8 ++++++--
 .../src/features/users/components/select-user.tsx         | 1 +
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx b/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx
index 30f16566..ae20ecbf 100644
--- a/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx
+++ b/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx
@@ -48,6 +48,10 @@ export function ToolbarSearch({ className, total, filtered }: ToolbarSearchProps
     return items.some(item => item.owner === userID);
   }
 
+  function handleSelectUser(userID: number | null) {
+    setFilterUser(userID);
+  }
+
   return (
     <div className={cn('flex gap-3 border-b text-sm bg-input items-center', className)}>
       <div className='ml-3 min-w-18 sm:min-w-30 select-none whitespace-nowrap'>
@@ -73,7 +77,7 @@ export function ToolbarSearch({ className, total, filtered }: ToolbarSearchProps
             icon={<IconUserSearch size='1.25rem' className={userActive ? 'icon-green' : 'icon-primary'} />}
             onClick={userMenu.toggle}
           />
-          <Dropdown isOpen={userMenu.isOpen}>
+          <Dropdown isOpen={userMenu.isOpen} margin='mt-1'>
             <DropdownButton
               text='Я - Владелец'
               title='Фильтровать схемы, в которых текущий пользователь является владельцем'
@@ -93,7 +97,7 @@ export function ToolbarSearch({ className, total, filtered }: ToolbarSearchProps
               className='min-w-60 mx-1 mb-1 cc-hover-bg select-none'
               filter={filterNonEmptyUsers}
               value={filterUser}
-              onChange={setFilterUser}
+              onChange={handleSelectUser}
             />
           </Dropdown>
         </div>
diff --git a/rsconcept/frontend/src/features/oss/components/select-parent.tsx b/rsconcept/frontend/src/features/oss/components/select-parent.tsx
index 1abc9ff7..c8044192 100644
--- a/rsconcept/frontend/src/features/oss/components/select-parent.tsx
+++ b/rsconcept/frontend/src/features/oss/components/select-parent.tsx
@@ -27,7 +27,7 @@ export function SelectParent({ fullWidth, ...restProps }: SelectParentProps) {
         size='2rem'
         className='text-primary min-w-8'
         data-tooltip-id={globalIDs.tooltip}
-        data-tooltip-content='Родительский блок содержания'
+        data-tooltip-content='Родительский блок'
       />
       <SelectBlock className={fullWidth ? 'grow' : 'w-70'} {...restProps} />
     </div>
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-schema.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-schema.tsx
index 088401b6..39700399 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-schema.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-schema.tsx
@@ -74,11 +74,11 @@ export function DlgCreateSchema() {
 
   return (
     <ModalForm
-      header='Создание операции: Пустая КС'
+      header='Создание операции: Новая схема'
       submitText='Создать'
       canSubmit={isValid}
       onSubmit={event => void handleSubmit(onSubmit)(event)}
-      className='w-180 px-6 cc-column'
+      className='w-180 px-6 pb-3 cc-column'
       helpTopic={HelpTopic.CC_OSS}
     >
       <TextInput
@@ -88,7 +88,7 @@ export function DlgCreateSchema() {
         error={errors.item_data?.title}
       />
       <div className='flex gap-6'>
-        <div className='grid gap-1'>
+        <div className='flex flex-col justify-between gap-3'>
           <TextInput
             id='operation_alias' //
             label='Сокращение'
@@ -113,7 +113,7 @@ export function DlgCreateSchema() {
           id='operation_comment' //
           label='Описание'
           noResize
-          rows={3}
+          rows={4}
           {...register('item_data.description')}
         />
       </div>
diff --git a/rsconcept/frontend/src/features/oss/dialogs/dlg-import-schema.tsx b/rsconcept/frontend/src/features/oss/dialogs/dlg-import-schema.tsx
index 8a2ff46b..4b48c237 100644
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-import-schema.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-import-schema.tsx
@@ -102,7 +102,7 @@ export function DlgImportSchema() {
       submitText='Создать'
       canSubmit={isValid}
       onSubmit={event => void handleSubmit(onSubmit)(event)}
-      className='w-180 px-6 cc-column'
+      className='w-180 px-6 pb-3 cc-column'
       helpTopic={HelpTopic.CC_OSS}
     >
       <Controller
@@ -132,7 +132,7 @@ export function DlgImportSchema() {
         error={errors.item_data?.title}
       />
       <div className='flex gap-6'>
-        <div className='grid gap-1'>
+        <div className='flex flex-col gap-3 justify-between'>
           <TextInput
             id='operation_alias' //
             label='Сокращение'
@@ -157,7 +157,7 @@ export function DlgImportSchema() {
         <TextArea
           id='operation_comment' //
           label='Описание'
-          rows={3}
+          rows={4}
           disabled={!clone_source}
           {...register('item_data.description')}
         />
diff --git a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/oss-flow.tsx b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/oss-flow.tsx
index 6bf619b1..4cd0a72f 100644
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/oss-flow.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/oss-flow.tsx
@@ -334,7 +334,12 @@ export function OssFlow() {
   }
 
   return (
-    <div tabIndex={-1} className='relative' onMouseMove={showCoordinates ? handleMouseMove : undefined}>
+    <div
+      tabIndex={-1}
+      className='relative'
+      onMouseMove={showCoordinates ? handleMouseMove : undefined}
+      onKeyDown={handleKeyDown}
+    >
       {showCoordinates ? <CoordinateDisplay mouseCoords={mouseCoords} className='absolute top-1 right-2' /> : null}
 
       <ContextMenu isOpen={isContextMenuOpen} onHide={hideContextMenu} {...menuProps} />
@@ -356,7 +361,6 @@ export function OssFlow() {
         {...flowOptions}
         className={clsx(!containMovement && 'cursor-relocate')}
         height={mainHeight}
-        onKeyDown={handleKeyDown}
         nodes={nodes}
         edges={edges}
         onNodesChange={onNodesChange}
diff --git a/rsconcept/frontend/src/features/users/components/select-user.tsx b/rsconcept/frontend/src/features/users/components/select-user.tsx
index ad7f729f..440bfd0f 100644
--- a/rsconcept/frontend/src/features/users/components/select-user.tsx
+++ b/rsconcept/frontend/src/features/users/components/select-user.tsx
@@ -43,6 +43,7 @@ export function SelectUser({ filter, noAnonymous, placeholder = 'Выбор по
     <ComboBox
       items={sorted}
       placeholder={placeholder}
+      clearable={true}
       idFunc={user => String(user)}
       labelValueFunc={user => getUserLabel(user)}
       labelOptionFunc={user => getUserLabel(user)}