M: Multiple minor UI fixes

2025-07-03 14:35:26 +03:00 · 2025-07-03 14:35:26 +03:00 · 1260f159c9
commit 1260f159c9
parent c361047caf
21 changed files with 31 additions and 35 deletions
--- a/rsconcept/frontend/src/features/help/items/ui/help-library.tsx
+++ b/rsconcept/frontend/src/features/help/items/ui/help-library.tsx
@ -48,7 +48,7 @@ export function HelpLibrary() {
          <IconUserSearch size='1rem' className='inline-icon' /> фильтр по пользователю
        </li>
        <li>
-          <IconSearch size='1rem' className='inline-icon' /> фильтр по названию и шифру
+          <IconSearch size='1rem' className='inline-icon' /> фильтр по названию и сокращению
        </li>
        <li>
          <IconFilterReset size='1rem' className='inline-icon' /> сбросить фильтры
--- a/rsconcept/frontend/src/features/library/components/pick-schema.tsx
+++ b/rsconcept/frontend/src/features/library/components/pick-schema.tsx
@ -59,7 +59,7 @@ export function PickSchema({
  const columns = [
    columnHelper.accessor('alias', {
      id: 'alias',
-      header: 'Шифр',
+      header: 'Сокращение',
      size: 150,
      minSize: 80,
      maxSize: 150
--- a/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx
+++ b/rsconcept/frontend/src/features/library/pages/library-page/toolbar-search.tsx
@ -88,7 +88,7 @@ export function ToolbarSearch({ className, total, filtered }: ToolbarSearchProps
            />
            <SelectUser
              aria-label='Выбор пользователя для фильтра по владельцу'
-              placeholder='Выберите владельца'
+              placeholder='Выбрать владельца'
              noBorder
              className='min-w-60 mx-1 mb-1 cc-hover-bg select-none'
              filter={filterNonEmptyUsers}
--- a/rsconcept/frontend/src/features/library/pages/library-page/use-library-columns.tsx
+++ b/rsconcept/frontend/src/features/library/pages/library-page/use-library-columns.tsx
@ -36,7 +36,7 @@ export function useLibraryColumns() {
        ]),
    columnHelper.accessor('alias', {
      id: 'alias',
-      header: 'Шифр',
+      header: 'Сокращение',
      size: 150,
      minSize: 80,
      maxSize: 150,
--- a/rsconcept/frontend/src/features/oss/components/oss-stats.tsx
+++ b/rsconcept/frontend/src/features/oss/components/oss-stats.tsx
@ -18,7 +18,7 @@ interface OssStatsProps {

 export function OssStats({ className, stats }: OssStatsProps) {
  return (
-    <aside className={cn('grid grid-cols-4 gap-1 justify-items-end h-min', className)}>
+    <aside className={cn('grid grid-cols-4 gap-1 justify-items-end h-min select-none', className)}>
      <div id='count_operations' className='w-fit flex gap-3 hover:cursor-default '>
        <span>Всего</span>
        <span>{stats.count_all}</span>
--- a/rsconcept/frontend/src/features/oss/components/pick-multi-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/components/pick-multi-operation.tsx
@ -62,7 +62,7 @@ export function PickMultiOperation({ rows, items, value, onChange, className, ..
  const columns = [
    columnHelper.accessor('alias', {
      id: 'alias',
-      header: 'Шифр',
+      header: 'Сокращение',
      size: 300,
      minSize: 150,
      maxSize: 300
@ -79,7 +79,7 @@ export function PickMultiOperation({ rows, items, value, onChange, className, ..
      id: 'actions',
      size: 0,
      cell: props => (
-        <div className='flex w-fit'>
+        <div className='flex gap-1 w-fit'>
          <MiniButton
            title='Удалить'
            className='px-0'
--- a/rsconcept/frontend/src/features/oss/components/select-block.tsx
+++ b/rsconcept/frontend/src/features/oss/components/select-block.tsx
@ -14,7 +14,7 @@ interface SelectBlockProps extends Styling {
  popoverClassname?: string;
 }

-export function SelectBlock({ items, placeholder = 'Выберите блок', ...restProps }: SelectBlockProps) {
+export function SelectBlock({ items, placeholder = 'Выбор блока', ...restProps }: SelectBlockProps) {
  return (
    <ComboBox
      items={items}
--- a/rsconcept/frontend/src/features/oss/components/select-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/components/select-operation.tsx
@ -14,7 +14,7 @@ interface SelectOperationProps extends Styling {
  popoverClassname?: string;
 }

-export function SelectOperation({ items, placeholder = 'Выберите операцию', ...restProps }: SelectOperationProps) {
+export function SelectOperation({ items, placeholder = 'Выбор операции', ...restProps }: SelectOperationProps) {
  return (
    <ComboBox
      items={items}
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-block/dlg-create-block.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-block/dlg-create-block.tsx
@ -77,7 +77,7 @@ export function DlgCreateBlock() {

  return (
    <ModalForm
-      header='Создание операции'
+      header='Создание блока'
      submitText='Создать'
      canSubmit={isValid}
      onSubmit={event => void methods.handleSubmit(onSubmit)(event)}
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-input-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-input-operation.tsx
@ -77,7 +77,7 @@ export function TabInputOperation() {
              <SelectParent
                items={manager.oss.blocks}
                value={field.value ? manager.oss.blockByID.get(field.value) ?? null : null}
-                placeholder='Блок содержания'
+                placeholder='Родительский блок'
                onChange={value => field.onChange(value ? value.id : null)}
              />
            )}
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-synthesis-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-create-operation/tab-synthesis-operation.tsx
@ -42,7 +42,7 @@ export function TabSynthesisOperation() {
              <SelectParent
                items={manager.oss.blocks}
                value={field.value ? manager.oss.blockByID.get(field.value) ?? null : null}
-                placeholder='Блок содержания'
+                placeholder='Родительский блок'
                onChange={value => field.onChange(value ? value.id : null)}
              />
            )}
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-operation.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-edit-operation/tab-operation.tsx
@ -39,7 +39,7 @@ export function TabOperation() {
          <SelectParent
            items={manager.oss.blocks}
            value={field.value ? manager.oss.blockByID.get(field.value) ?? null : null}
-            placeholder='Блок содержания'
+            placeholder='Родительский блок'
            onChange={value => field.onChange(value ? value.id : null)}
          />
        )}
--- a/rsconcept/frontend/src/features/oss/dialogs/dlg-relocate-constituents.tsx
+++ b/rsconcept/frontend/src/features/oss/dialogs/dlg-relocate-constituents.tsx
@ -122,8 +122,8 @@ export function DlgRelocateConstituents() {
        <div className='flex gap-1 items-center bg-input border-b rounded-t-md'>
          <SelectLibraryItem
            noBorder
-            className='w-1/2'
-            placeholder='Выберите исходную схему'
+            className='w-1/2 shrink-1'
+            placeholder='Исходная схема'
            items={sourceSchemas}
            value={source}
            onChange={handleSelectSource}
@ -135,8 +135,8 @@ export function DlgRelocateConstituents() {
          />
          <SelectLibraryItem
            noBorder
-            className='w-1/2'
-            placeholder='Выберите целевую схему'
+            className='w-1/2 shrink-1'
+            placeholder='Целевая схема'
            items={destinationSchemas}
            value={destinationItem}
            onChange={handleSelectDestination}
--- a/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/side-panel/side-panel.tsx
+++ b/rsconcept/frontend/src/features/oss/pages/oss-page/editor-oss-graph/side-panel/side-panel.tsx
@ -30,7 +30,7 @@ export function SidePanel({ selectedItems, isMounted, className }: SidePanelProp
  const sidePanelHeight = useMainHeight();

  return (
-    <div
+    <aside
      className={cn(
        'relative flex flex-col py-2 h-full overflow-hidden',
        'border-l rounded-none rounded-l-sm bg-background',
@ -67,6 +67,6 @@ export function SidePanel({ selectedItems, isMounted, className }: SidePanelProp
          <ViewSchema schemaID={selectedSchema} />
        </Suspense>
      ) : null}
-    </div>
+    </aside>
  );
 }
--- a/rsconcept/frontend/src/features/rsform/components/pick-substitutions.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/pick-substitutions.tsx
@ -231,7 +231,7 @@ export function PickSubstitutions({
          <SelectLibraryItem
            id='substitute-left-schema'
            noBorder
-            placeholder='Выберите аргумент'
+            placeholder='Аргумент'
            items={allowSelfSubstitution ? schemas : schemas.filter(item => item.id !== rightArgument?.id)}
            value={leftArgument}
            onChange={setLeftArgument}
@ -263,7 +263,7 @@ export function PickSubstitutions({
          <SelectLibraryItem
            id='substitute-right-schema'
            noBorder
-            placeholder='Выберите аргумент'
+            placeholder='Аргумент'
            items={allowSelfSubstitution ? schemas : schemas.filter(item => item.id !== leftArgument?.id)}
            value={rightArgument}
            onChange={setRightArgument}
--- a/rsconcept/frontend/src/features/rsform/components/rsform-stats.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/rsform-stats.tsx
@ -29,7 +29,7 @@ interface RSFormStatsProps {

 export function RSFormStats({ className, stats }: RSFormStatsProps) {
  return (
-    <aside className={cn('h-min', 'grid grid-cols-4 gap-1 justify-items-end ', className)}>
+    <div className={cn('h-min', 'grid grid-cols-4 gap-1 justify-items-end select-none', className)}>
      <div id='count_all' className='col-span-2 w-fit flex gap-3 hover:cursor-default'>
        <span>Всего</span>
        <span>{stats.count_all}</span>
@ -138,6 +138,6 @@ export function RSFormStats({ className, stats }: RSFormStatsProps) {
        }
        value={stats.count_convention}
      />
-    </aside>
+    </div>
  );
 }
--- a/rsconcept/frontend/src/features/rsform/components/select-constituenta.tsx
+++ b/rsconcept/frontend/src/features/rsform/components/select-constituenta.tsx
@ -16,7 +16,7 @@ interface SelectConstituentaProps {

 export function SelectConstituenta({
  items,
-  placeholder = 'Выберите конституенту',
+  placeholder = 'Выбор конституенты',
  ...restProps
 }: SelectConstituentaProps) {
  return (
--- a/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/tab-template.tsx
+++ b/rsconcept/frontend/src/features/rsform/dialogs/dlg-cst-template/tab-template.tsx
@ -67,7 +67,7 @@ export function TabTemplate() {
          noBorder
          noSearch
          clearable
-          placeholder='Выберите категорию'
+          placeholder='Категория'
          className='grow'
          idFunc={cst => String(cst.id)}
          labelValueFunc={cst => cst.term_raw}
--- a/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/editor-rsform-card.tsx
+++ b/rsconcept/frontend/src/features/rsform/pages/rsform-page/editor-rsform-card/editor-rsform-card.tsx
@ -63,14 +63,15 @@ export function EditorRSFormCard() {
        <EditorLibraryItem schema={schema} isAttachedToOSS={isAttachedToOSS} />
      </div>

-      <RSFormStats
+      <aside
        className={clsx(
          'w-80 md:w-56 mt-3 md:mt-8 mx-auto md:ml-5 md:mr-0',
          'cc-animate-sidebar',
          showRSFormStats ? 'max-w-full' : 'opacity-0 max-w-0'
        )}
-        stats={schema.stats}
-      />
+      >
+        <RSFormStats stats={schema.stats} />
+      </aside>
    </div>
  );
 }
--- a/rsconcept/frontend/src/features/users/components/select-user.tsx
+++ b/rsconcept/frontend/src/features/users/components/select-user.tsx
@ -31,12 +31,7 @@ function compareUsers(a: IUserInfo, b: IUserInfo) {
  return a.id - b.id;
 }

-export function SelectUser({
-  filter,
-  noAnonymous,
-  placeholder = 'Выберите пользователя',
-  ...restProps
-}: SelectUserProps) {
+export function SelectUser({ filter, noAnonymous, placeholder = 'Выбор пользователя', ...restProps }: SelectUserProps) {
  const { users } = useUsers();
  const getUserLabel = useLabelUser();

--- a/rsconcept/frontend/src/styling/utilities.css
+++ b/rsconcept/frontend/src/styling/utilities.css
@ -151,7 +151,7 @@
@utility cc-animate-panel {
  transition-property: translate, opacity;
  transition-timing-function: var(--ease-bezier);
-  transition-duration: var(--duration-transform);
+  transition-duration: var(--duration-move);
 }

@utility cc-animate-position {