-
Notifications
You must be signed in to change notification settings - Fork 49
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
[3958] Prevent Stackoverflow when rendering a twice an expanded TreeItem #4015
base: master
Are you sure you want to change the base?
Conversation
public static final String EXPANDED = "expanded"; | ||
|
||
public static final String ACTIVE_FILTER_IDS = "activeFilterIds"; | ||
|
||
private static final Logger LOGGER = LoggerFactory.getLogger(TreeRenderer.class); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
private final Logger logger = ...
No need to this to be static
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok
public static final String EXPANDED = "expanded"; | ||
|
||
public static final String ACTIVE_FILTER_IDS = "activeFilterIds"; | ||
|
||
private static final Logger LOGGER = LoggerFactory.getLogger(TreeRenderer.class); | ||
|
||
private static final StyledStringFragment ITEM_RENDERING_LOOP_FRAGMENT = new StyledStringFragment("<Item rendering loop> ", StyledStringFragmentStyle.newDefaultStyledStringFragmentStyle() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need to make this a constant, just use it where you need it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I hesitated so ok
* @return <code>true</code> if a loop is detected | ||
*/ | ||
private boolean loopDetected(VariableManager treeItemVariableManager, String id) { | ||
// @formatter:off |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove those useless // @formatter:off
, there are other instances of this in this file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK
childrenTreeItems.add(this.renderTreeItem(childVariableManager)); | ||
} | ||
return TreeItem.newTreeItem(id) | ||
return TreeItem.newTreeItem(id).kind(kind).label(label).editable(editable).deletable(deletable).selectable(selectable).iconURL(iconURL).children(childrenTreeItems).hasChildren(hasChildren) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please put that on multiple lines
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok
fragments.add(0, ITEM_RENDERING_LOOP_FRAGMENT); | ||
StyledString newLabel = new StyledString(fragments); | ||
List<String> newIcons = new ArrayList<>(iconURL); | ||
newIcons.add("/icons/svg/warning-overlay.svg"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do not contribute images like that, it can't work in all use cases. Consumers of Sirius Components may not use Sirius Web and as such the path on which they are hosting their images may be different.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So I just keep the prefix warning an its enough for the user to be aware of the problem.
That is fine by me
.expanded(expanded).build(); | ||
} | ||
|
||
private TreeItem renderWarningTreeItem(String id, String kind, StyledString label, List<String> iconURL, VariableManager mng) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
iconURL
->iconURLs
?
-mng
->variableManager
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok
for (Object rootElement : rootElements) { | ||
VariableManager rootElementVariableManager = this.variableManager.createChild(); | ||
rootElementVariableManager.put(VariableManager.SELF, rootElement); | ||
rootElementVariableManager.put(INDEX, index++); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is that index really necessary and do you really have to put this in the variable manager? It will be propagated to everybody.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes see unit test org.eclipse.sirius.components.trees.renderer.TreeRendererTests.checkAvoidStackOverFlow() line 142.
My purpose is to create unique id for those virtual elements.
In that test I have "child1" that want to display twice an item representing "Root" (for some dark reason I guess).
If I want my specifier to be able to create a unique ID it need both:
- The id of all my ancestors
- My index in my TreeItem parent
If do only have ancestor I am not able to create a stable unique id
@@ -0,0 +1,43 @@ | |||
<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you really want to contribute an image, use one from MUI
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No I'm going to do what you say and simply delete this icon
String path = idPath.stream().map(Object::toString).collect(joining("::")).toString() + "#" + mng.get(INDEX, Integer.class); | ||
|
||
// This would need to be encoded to avoid getting a problem with id containing # | ||
String virtualId = "siriuscomponent://treelooprendering?itemId=" + id + "&path=" + path; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why change that much the original id?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same reason describe here #4015 (comment)
If I want to be "sure" to have unique id I needs to have the path of the current item.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe I could generate an UUID from that string it could be simpler?
* | ||
* @author Arthur Daussy | ||
*/ | ||
public class TreeRendererTests { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please prefer an integration test to validate the whole process
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please don't make me do that 😢
Unit testing is life...
It this particular case it allowed me to easily create the "StackOverflow" use case and use a TDD approach. It even help me to fix to issue. It help me to detect the need of the index to give the capacity for the specifier to create truly unique id.
Could you explain why you prefer integration test of unit test please?
In order to avoid too long id I translate the possible long path into a UUID String path = idPath.stream().map(Object::toString).collect(joining("::")).toString() + "#" + variableManager.get(INDEX, Integer.class);
String virtualId = "siriuscomponent://treelooprendering?renderedItemId=" + id + "&itemItem=" + UUID.nameUUIDFromBytes(path.getBytes()); I hope that is fine by you |
This commit provide a partial fix for the given bug. It only prevents rendering twice in the same tree path and expanded element because it would cause an infinite loop. A fix still need to be implemented in the "Expand All" action to prevent stackoverfow when rendering a infinite loop with non unique ID. Bug: eclipse-sirius#3958 Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>
25495ff
to
2b10030
Compare
This commit provide a partial fix for the given bug. It only prevents rendering twice in the same tree path and expanded element because it would cause an infinite loop.
A fix still need to be implemented in the "Expand All" action to prevent stackoverfow when rendering a infinite loop with non unique ID.
Bug: #3958
Pull request template
General purpose
What is the main goal of this pull request?
Project management
priority:
andpr:
labels been added to the pull request? (In case of doubt, start with the labelspriority: low
andpr: to review later
)area:
,difficulty:
,type:
)CHANGELOG.adoc
been updated to reference the relevant issues?CHANGELOG.adoc
? (Including changes in the GraphQL API)CHANGELOG.adoc
? For example indoc/screenshots/2022.5.0-my-new-feature.png
Architectural decision records (ADR)
[doc]
?CHANGELOG.adoc
?Dependencies
CHANGELOG.adoc
?CHANGELOG.adoc
?Frontend
This section is not relevant if your contribution does not come with changes to the frontend.
General purpose
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).
useMutation<DATA_TYPE, VARIABLE_TYPE>(…)
useQuery<DATA_TYPE, VARIABLE_TYPE>(…)
useSubscription<DATA_TYPE, VARIABLE_TYPE>(…)
useMachine<CONTEXT_TYPE, EVENTS_TYPE>(…)
useState<STATE_TYPE>(…)
?.
(if the GraphQL API specifies that a field cannot benull
, do not treat it has potentiallynull
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
Architecture
Review
How to test this PR?
Please describe here the various use cases to test this pull request