Skip to content

Commit 17de23f

Browse files
pcdavidAxelRICHARD
authored andcommitted
[cleanup] Fix data-testid in InsertTextualSysMLv2Modal
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
1 parent 29f91f6 commit 17de23f

2 files changed

Lines changed: 2 additions & 11 deletions

File tree

backend/services/syson-sysml-metamodel-services/src/main/java/org/eclipse/syson/sysml/metamodel/services/MetamodelQueryElementService.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@
2121
import org.eclipse.syson.sysml.ActorMembership;
2222
import org.eclipse.syson.sysml.Connector;
2323
import org.eclipse.syson.sysml.Element;
24-
import org.eclipse.syson.sysml.ElementFilterMembership;
2524
import org.eclipse.syson.sysml.Expression;
2625
import org.eclipse.syson.sysml.Feature;
2726
import org.eclipse.syson.sysml.FeatureValue;
2827
import org.eclipse.syson.sysml.PartUsage;
2928
import org.eclipse.syson.sysml.ReferenceUsage;
3029
import org.eclipse.syson.sysml.StakeholderMembership;
31-
import org.eclipse.syson.sysml.ResultExpressionMembership;
3230
import org.eclipse.syson.sysml.SubjectMembership;
3331
import org.eclipse.syson.sysml.Usage;
3432

@@ -91,13 +89,7 @@ public boolean isStakeholder(Element element) {
9189
* @return true if the element is an actual expression definition.
9290
*/
9391
public boolean isExpressionDefinition(Element element) {
94-
if (element instanceof Expression && !(element instanceof Usage)) {
95-
var owningRelationship = element.getOwningRelationship();
96-
return owningRelationship instanceof FeatureValue || owningRelationship instanceof ElementFilterMembership
97-
|| owningRelationship instanceof ResultExpressionMembership;
98-
} else {
99-
return false;
100-
}
92+
return element instanceof Expression && !(element instanceof Usage);
10193
}
10294

10395
/**

frontend/syson-components/src/extensions/InsertTextualSysMLv2Modal.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import { Theme } from '@mui/material/styles';
2222
import TextField from '@mui/material/TextField';
2323
import { useEffect, useState } from 'react';
2424
import { makeStyles } from 'tss-react/mui';
25-
2625
import { InsertTextualSysMLv2ModalProps, InsertTextualSysMLv2ModalState } from './InsertTextualSysMLv2Modal.types';
2726
import { NewObjectAsTextReport } from './NewObjectAsTextDocumentReport';
2827
import { useInsertTextualSysMLv2 } from './useInsertTextualSysMLv2';
@@ -106,7 +105,7 @@ export const InsertTextualSysMLv2Modal = ({ editingContextId, item, onClose }: I
106105
onClick={(event) => onInsertTextualSysMLv2(event)}
107106
startIcon={
108107
state.insertInProgress ? (
109-
<CircularProgress size="20px" data-testid="arrange-all-circular-loading" />
108+
<CircularProgress size="20px" data-testid="create-objects-circular-loading" />
110109
) : (
111110
<PublishIcon />
112111
)

0 commit comments

Comments
 (0)