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.

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

[2608] Improve the layout of edge handles on the left and right side of nodes #2603

Merged
merged 1 commit into from Nov 21, 2023

Conversation

pcdavid
Copy link
Member

@pcdavid pcdavid commented Nov 21, 2023

Signed-off-by: Pierre-Charles David pierre-charles.david@obeo.fr

Pull request template

General purpose

What is the main goal of this pull request?

  • Bug fixes
  • New features
  • Documentation
  • Cleanup
  • Tests
  • Build / releng

Project management

  • Has the pull request been added to the relevant project and milestone? (Only if you know that your work is part of a specific iteration such as the current one)
  • Have the priority: and pr: labels been added to the pull request? (In case of doubt, start with the labels priority: low and pr: to review later)
  • Have the relevant issues been added to the pull request?
  • Have the relevant labels been added to the issues? (area:, difficulty:, type:)
  • Have the relevant issues been added to the same project and milestone as the pull request?
  • Has the CHANGELOG.adoc been updated to reference the relevant issues?
  • Have the relevant API breaks been described in the CHANGELOG.adoc? (Including changes in the GraphQL API)
  • In case of a change with a visual impact, are there any screenshots in the CHANGELOG.adoc? For example in doc/screenshots/2022.5.0-my-new-feature.png

Architectural decision records (ADR)

  • Does the title of the commit contributing the ADR start with [doc]?
  • Are the ADRs mentioned in the relevant section of the CHANGELOG.adoc?

Dependencies

  • Are the new / upgraded dependencies mentioned in the relevant section of the CHANGELOG.adoc?
  • Are the new dependencies justified in the CHANGELOG.adoc?

Frontend

This section is not relevant if your contribution does not come with changes to the frontend.

General purpose

  • Is the code properly tested? (Plain old JavaScript tests for business code and tests based on React Testing Library for the components)

Typing

We need to improve the typing of our code, as such, we require every contribution to come with proper TypeScript typing for both changes contributing new files and those modifying existing files.
Please ensure that the following statements are true for each file created or modified (this may require you to improve code outside of your contribution).

  • Variables have a proper type
  • Functions’ arguments have a proper type
  • Functions’ return type are specified
  • Hooks are properly typed:
    • useMutation<DATA_TYPE, VARIABLE_TYPE>(…)
    • useQuery<DATA_TYPE, VARIABLE_TYPE>(…)
    • useSubscription<DATA_TYPE, VARIABLE_TYPE>(…)
    • useMachine<CONTEXT_TYPE, EVENTS_TYPE>(…)
    • useState<STATE_TYPE>(…)
  • All components have a proper typing for their props
  • No useless optional chaining with ?. (if the GraphQL API specifies that a field cannot be null, do not treat it has potentially null for example)
  • Nullable values have a proper type (for example let diagram: Diagram | null = null;)

Backend

This section is not relevant if your contribution does not come with changes to the backend.

General purpose

  • Are all the event handlers tested?
  • Are the event processor tested?
  • Is the business code (services) tested?
  • Are diagram layout changes tested?

Architecture

  • Are data structure classes properly separated from behavioral classes?
  • Are all the relevant fields final?
  • Is any data structure mutable? If so, please write a comment indicating why
  • Are behavioral classes either stateless or side effect free?

Review

How to test this PR?

Please describe here the various use cases to test this pull request

  • Has the Kiwi TCMS test suite been updated with tests for this contribution?

@pcdavid pcdavid changed the title [enh] Improve the layout of edge handles on the left and right side of nodes [2608] Improve the layout of edge handles on the left and right side of nodes Nov 21, 2023
@pcdavid pcdavid added this to the 2023.12.0 milestone Nov 21, 2023
@@ -102,6 +102,34 @@ export const ConnectionHandles = ({ connectionHandles }: ConnectionHandlesProps)
return !!handlesSelected.find((selectedHandle) => selectedHandle === connectionHandle.id);
};

const rightSideVirtualHandleId = `handle--source--${nodeId}--${
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

const rightSideVirtualHandleId = handle--source--${nodeId}--${ connectionHandles.filter((connectionHandle) => connectionHandle.type === 'source').length + 1 };

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for the left one with target

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the second commit. It's not essential to the fix and causes unexpected problems.

@mcharfadi
Copy link
Contributor

The warning Couldn't create edge for target handle id came back when I create an edge.

@pcdavid pcdavid force-pushed the pcd/enh/handles-layout branch 2 times, most recently from 858515c to 7d0ac8b Compare November 21, 2023 15:36
… nodes

Make sure the "virtual" handles added after the real ones are not
considered by the flexbox on the container.

Bug: #2608
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
Copy link
Contributor

@mcharfadi mcharfadi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be merged after a successful build

@pcdavid pcdavid merged commit 7a6a17e into master Nov 21, 2023
4 checks passed
@pcdavid pcdavid deleted the pcd/enh/handles-layout branch November 21, 2023 15:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Edges connected to the left or right side of a node are not properly centered
2 participants