Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CSCFC4EMSCR-611 pull request to develop #238

Merged
merged 1 commit into from
Dec 10, 2024
Merged

CSCFC4EMSCR-611 pull request to develop #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ export default function NodeMappings(props: {
if (action === 'moveNodeUp' && mappingNodes.length > 1) {
let sourceNodesNew = [...mappingNodes];
for (let i = 0; i < mappingNodes.length; i += 1) {
if (mappingNodes[i].source.id === mappingId) {
if ((isSourceNode && mappingNodes[i].source.id === mappingId) || (!isSourceNode && mappingNodes[i].target.id === mappingId)) {
let first = mappingNodes[i - 1];
let second = mappingNodes[i];
sourceNodesNew[i - 1] = second;
Expand All @@ -244,7 +244,7 @@ export default function NodeMappings(props: {
} else if (action === 'moveNodeDown' && mappingNodes.length > 1) {
let sourceNodesNew = [...mappingNodes];
for (let i = 0; i < mappingNodes.length; i += 1) {
if (mappingNodes[i].source.id === mappingId) {
if ((isSourceNode && mappingNodes[i].source.id === mappingId) || (!isSourceNode && mappingNodes[i].target.id === mappingId)) {
let first = mappingNodes[i];
let second = mappingNodes[i + 1];
sourceNodesNew[i] = second;
Expand Down
6 changes: 3 additions & 3 deletions mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/node-listing-accordion/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,16 +207,16 @@ function Row(props: {
<div
className={props.rowCount > 1 ? 'd-flex flex-column justify-content-center' : 'd-flex flex-column justify-content-center d-none'}>
<div>
<Tooltip className={props.index !== 0 && props.isSourceAccordion ? '' : 'd-none'}
<Tooltip className={props.index !== 0 ? '' : 'd-none'}
title={'Order node up'}
placement="left"
>
<StyledArrowCircleUp
onClick={() => moveNode(true)}></StyledArrowCircleUp>
</Tooltip>
</div>
<div className={props.isSourceAccordion ? '' : 'ms-3'}>
{props.index !== props.rowCount - 1 && props.rowCount > 1 && props.isSourceAccordion &&
<div>
{props.index !== props.rowCount - 1 && props.rowCount > 1 &&
<Tooltip
title={'Order node down'}
placement="left"
Expand Down
Loading