ConceptProd/Portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

M: Minor UI fixes and coverage fix

Browse Source
This commit is contained in:
Ivan 2024-08-19 18:32:21 +03:00
parent 13442c44aa
commit 02afd44488
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rsconcept/frontend/src/components/select/PickSubstitutions.tsx
View File

@ -159,7 +159,7 @@ function PickSubstitutions({
id: 'right_alias', id: 'right_alias',
size: 65, size: 65,
cell: props => ( cell: props => (
<BadgeConstituenta theme={colors} value={props.row.original.original} prefixID={`${prefixID}_1_`} /> <BadgeConstituenta theme={colors} value={props.row.original.original} prefixID={`${prefixID}_2_`} />
) )
}), }),
columnHelper.accessor(item => item.original_source.alias, { columnHelper.accessor(item => item.original_source.alias, {

3
rsconcept/frontend/src/dialogs/DlgDeleteOperation.tsx
View File

@ -45,6 +45,7 @@ function DlgDeleteOperation({ hideWindow, target, onSubmit }: DlgDeleteOperation
titleHtml='Наследованные конституенты <br/>превратятся в дописанные' titleHtml='Наследованные конституенты <br/>превратятся в дописанные'
value={keepConstituents} value={keepConstituents}
setValue={setKeepConstituents} setValue={setKeepConstituents}
disabled={target.result === null}
/> />
<Checkbox <Checkbox
label='Удалить схему' label='Удалить схему'
@ -55,7 +56,7 @@ function DlgDeleteOperation({ hideWindow, target, onSubmit }: DlgDeleteOperation
} }
value={deleteSchema} value={deleteSchema}
setValue={setDeleteSchema} setValue={setDeleteSchema}
disabled={!target.is_owned || target.result === undefined} disabled={!target.is_owned || target.result === null}
/> />
</Modal> </Modal>
); );

2
rsconcept/frontend/src/pages/OssPage/EditorOssGraph/OssFlow.tsx
View File

@ -357,7 +357,7 @@ function OssFlow({ isModified, setIsModified }: OssFlowProps) {
fitView fitView
nodeTypes={OssNodeTypes} nodeTypes={OssNodeTypes}
maxZoom={2} maxZoom={2}
minZoom={0.75} minZoom={0.5}
nodesConnectable={false} nodesConnectable={false}
snapToGrid={true} snapToGrid={true}
snapGrid={[PARAMETER.ossGridSize, PARAMETER.ossGridSize]} snapGrid={[PARAMETER.ossGridSize, PARAMETER.ossGridSize]}

2
rsconcept/frontend/src/pages/RSFormPage/EditorConstituenta/FormConstituenta.tsx
View File

@ -220,7 +220,7 @@ function FormConstituenta({
label={isBasic ? 'Конвенция' : 'Комментарий'} label={isBasic ? 'Конвенция' : 'Комментарий'}
placeholder={isBasic ? 'Договоренность об интерпретации' : 'Пояснение разработчика'} placeholder={isBasic ? 'Договоренность об интерпретации' : 'Пояснение разработчика'}
value={convention} value={convention}
disabled={disabled} disabled={disabled || (isBasic && state?.is_inherited)}
rows={convention.length > 2 * ROW_SIZE_IN_CHARACTERS || convention.includes('\n') ? 4 : 2} rows={convention.length > 2 * ROW_SIZE_IN_CHARACTERS || convention.includes('\n') ? 4 : 2}
onChange={event => setConvention(event.target.value)} onChange={event => setConvention(event.target.value)}
/> />

2
scripts/dev/RunCoverage.ps1
View File

@ -11,7 +11,7 @@ function BackendCoverage() {
$coverageExec = "$backend\venv\Scripts\coverage.exe" $coverageExec = "$backend\venv\Scripts\coverage.exe"
$djangoSrc = "$backend\manage.py" $djangoSrc = "$backend\manage.py"
$exclude = '*/venv/*,*/tests/*,*/migrations/*,*__init__.py,manage.py,apps.py,urls.py,settings.py' $exclude = '*/venv/*,*/tests/*,*/migrations/*,*__init__.py,shared/*,manage.py,apps.py,urls.py,settings.py,admin.py'
& $coverageExec run --omit=$exclude $djangoSrc test & $coverageExec run --omit=$exclude $djangoSrc test
& $coverageExec report & $coverageExec report