diff --git a/rsconcept/frontend/src/components/info/InfoConstituenta.tsx b/rsconcept/frontend/src/components/info/InfoConstituenta.tsx index 8d0d01ae..230cf78b 100644 --- a/rsconcept/frontend/src/components/info/InfoConstituenta.tsx +++ b/rsconcept/frontend/src/components/info/InfoConstituenta.tsx @@ -23,7 +23,7 @@ function InfoConstituenta({ data, className, ...restProps }: InfoConstituentaPro {data.term_resolved || data.term_raw}

) : null} -

+

Типизация: {labelCstTypification(data)}

diff --git a/rsconcept/frontend/src/dialogs/DlgCreateOperation/TabInputOperation.tsx b/rsconcept/frontend/src/dialogs/DlgCreateOperation/TabInputOperation.tsx index e7f47b96..358791b9 100644 --- a/rsconcept/frontend/src/dialogs/DlgCreateOperation/TabInputOperation.tsx +++ b/rsconcept/frontend/src/dialogs/DlgCreateOperation/TabInputOperation.tsx @@ -14,7 +14,6 @@ import { useLibrary } from '@/context/LibraryContext'; import { ILibraryItem, LibraryItemID, LibraryItemType } from '@/models/library'; import { IOperationSchema } from '@/models/oss'; import { sortItemsForOSS } from '@/models/ossAPI'; -import { limits, patterns } from '@/utils/constants'; interface TabInputOperationProps { oss: IOperationSchema; @@ -67,8 +66,6 @@ function TabInputOperation({ id='operation_alias' label='Сокращение' className='w-[14rem]' - pattern={patterns.library_alias} - title={`не более ${limits.library_alias_len} символов`} value={alias} onChange={event => setAlias(event.target.value)} disabled={attachedID !== undefined} diff --git a/rsconcept/frontend/src/dialogs/DlgCreateOperation/TabSynthesisOperation.tsx b/rsconcept/frontend/src/dialogs/DlgCreateOperation/TabSynthesisOperation.tsx index 24c208ca..03e675df 100644 --- a/rsconcept/frontend/src/dialogs/DlgCreateOperation/TabSynthesisOperation.tsx +++ b/rsconcept/frontend/src/dialogs/DlgCreateOperation/TabSynthesisOperation.tsx @@ -4,7 +4,6 @@ import TextArea from '@/components/ui/TextArea'; import TextInput from '@/components/ui/TextInput'; import AnimateFade from '@/components/wrap/AnimateFade'; import { IOperationSchema, OperationID } from '@/models/oss'; -import { limits, patterns } from '@/utils/constants'; import PickMultiOperation from '../../components/select/PickMultiOperation'; @@ -44,8 +43,6 @@ function TabSynthesisOperation({ id='operation_alias' label='Сокращение' className='w-[14rem]' - pattern={patterns.library_alias} - title={`не более ${limits.library_alias_len} символов`} value={alias} onChange={event => setAlias(event.target.value)} /> diff --git a/rsconcept/frontend/src/dialogs/DlgEditOperation/TabOperation.tsx b/rsconcept/frontend/src/dialogs/DlgEditOperation/TabOperation.tsx index e79f1c1f..38901be6 100644 --- a/rsconcept/frontend/src/dialogs/DlgEditOperation/TabOperation.tsx +++ b/rsconcept/frontend/src/dialogs/DlgEditOperation/TabOperation.tsx @@ -1,7 +1,6 @@ import TextArea from '@/components/ui/TextArea'; import TextInput from '@/components/ui/TextInput'; import AnimateFade from '@/components/wrap/AnimateFade'; -import { limits, patterns } from '@/utils/constants'; interface TabOperationProps { alias: string; @@ -26,8 +25,6 @@ function TabOperation({ alias, setAlias, title, setTitle, comment, setComment }: id='operation_alias' label='Сокращение' className='w-[14rem]' - pattern={patterns.library_alias} - title={`не более ${limits.library_alias_len} символов`} value={alias} onChange={event => setAlias(event.target.value)} /> diff --git a/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx b/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx index ae6fd15c..14f1c334 100644 --- a/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx +++ b/rsconcept/frontend/src/pages/CreateItemPage/FormCreateItem.tsx @@ -26,7 +26,7 @@ import useLocalStorage from '@/hooks/useLocalStorage'; import { AccessPolicy, LibraryItemType, LocationHead } from '@/models/library'; import { ILibraryCreateData } from '@/models/library'; import { combineLocation, validateLocation } from '@/models/libraryAPI'; -import { EXTEOR_TRS_FILE, limits, patterns, storage } from '@/utils/constants'; +import { EXTEOR_TRS_FILE, storage } from '@/utils/constants'; import { information } from '@/utils/labels'; function FormCreateItem() { @@ -153,8 +153,6 @@ function FormCreateItem() { label='Сокращение' placeholder={file && 'Загрузить из файла'} className='w-[14rem]' - pattern={patterns.library_alias} - title={`не более ${limits.library_alias_len} символов`} value={alias} onChange={event => setAlias(event.target.value)} /> diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/FormOSS.tsx b/rsconcept/frontend/src/pages/OssPage/EditorOssCard/FormOSS.tsx index 591ebece..fdcb352a 100644 --- a/rsconcept/frontend/src/pages/OssPage/EditorOssCard/FormOSS.tsx +++ b/rsconcept/frontend/src/pages/OssPage/EditorOssCard/FormOSS.tsx @@ -11,7 +11,6 @@ import TextInput from '@/components/ui/TextInput'; import { useOSS } from '@/context/OssContext'; import { ILibraryUpdateData, LibraryItemType } from '@/models/library'; import ToolbarItemAccess from '@/pages/RSFormPage/EditorRSFormCard/ToolbarItemAccess'; -import { limits, patterns } from '@/utils/constants'; import { information } from '@/utils/labels'; import { useOssEdit } from '../OssEditContext'; @@ -102,8 +101,6 @@ function FormOSS({ id, isModified, setIsModified }: FormOSSProps) { required label='Сокращение' className='w-[14rem]' - pattern={patterns.library_alias} - title={`не более ${limits.library_alias_len} символов`} disabled={!controller.isMutable} value={alias} onChange={event => setAlias(event.target.value)} diff --git a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx b/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx index 00d72463..0ffdf3c5 100644 --- a/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx +++ b/rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx @@ -335,7 +335,6 @@ function OssFlow({ isModified, setIsModified }: OssFlowProps) { } } - const canvasWidth = useMemo(() => 'calc(100vw - 1rem)', []); const canvasHeight = useMemo(() => calculateHeight('1.75rem + 4px'), [calculateHeight]); const OssNodeTypes: NodeTypes = useMemo( @@ -413,7 +412,7 @@ function OssFlow({ isModified, setIsModified }: OssFlowProps) { {...menuProps} /> ) : null} -
+
{graph}
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx index 1dbe513b..09a1bfd4 100644 --- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx +++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx @@ -10,7 +10,6 @@ import SubmitButton from '@/components/ui/SubmitButton'; import TextArea from '@/components/ui/TextArea'; import TextInput from '@/components/ui/TextInput'; import { ILibraryUpdateData, LibraryItemType } from '@/models/library'; -import { limits, patterns } from '@/utils/constants'; import { useRSEdit } from '../RSEditContext'; import ToolbarItemAccess from './ToolbarItemAccess'; @@ -102,8 +101,6 @@ function FormRSForm({ id, isModified, setIsModified }: FormRSFormProps) { required label='Сокращение' className='w-[14rem]' - pattern={patterns.library_alias} - title={`не более ${limits.library_alias_len} символов`} disabled={!controller.isContentEditable} value={alias} onChange={event => setAlias(event.target.value)} diff --git a/rsconcept/frontend/src/utils/constants.ts b/rsconcept/frontend/src/utils/constants.ts index f36d7299..167fb57c 100644 --- a/rsconcept/frontend/src/utils/constants.ts +++ b/rsconcept/frontend/src/utils/constants.ts @@ -35,7 +35,6 @@ export const PARAMETER = { * Numeric limitations. */ export const limits = { - library_alias_len: 12, location_len: 500 }; @@ -48,8 +47,7 @@ export const EXTEOR_TRS_FILE = '.trs'; * Regex patterns for data validation. */ export const patterns = { - login: '^[a-zA-Z][a-zA-Z0-9_\\-]{1,}[a-zA-Z0-9]$', - library_alias: `.{1,${limits.library_alias_len}}` + login: '^[a-zA-Z][a-zA-Z0-9_\\-]{1,}[a-zA-Z0-9]$' }; /**